opengeo/GeoGit — pull request #302 by jdgarrett (2013-05-16 18:18:04+00:00)
Title: Store Conflicts Separately for Transactions

Currently, all conflicts are stored in the index. This causes a problem when performing a merge with conflicts within a transaction because the main repository believes there are conflicts, when they should only exist in the transaction. This pull request makes it so the conflict file is stored within the transaction directory. Conflicts that happen outside of a transaction will still be stored in the index.