Propagate conflicts on end transaction.

This PR introduces a basic ConflictsException, from which MergeConflictsException and RebaseConflictsException are derived.  These exceptions are thrown by Merge and Rebase and are now propagated through end transaction.