Allow users to ignore conflicts when committing.

[dcherian]

While dangerous, this is useful for the case where users know that they are orchestrating writes so that there are no real conflicts (and any detected conflict is a trivial rebase).

[paraseba]

This is to avoid the performance impact of rebasing (checking for conflicts)