boundlessgeo/GeoGit — pull request #542 by jdgarrett (2014-01-08 15:14:14+00:00)
Title: 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.