Allow to perform custom decisions in case of merge conflict

Last modified by Simon Urli on 2019/08/12

The Diff module now takes new API to enhance the 3-way merge operation. The MergeResult is now capable to return a list of Conflict object which gives some more information about the conflicts that occured during the merge. Those conflicts can be solved on a case-by-case basis by specifiying some ConflictDecision in the MergeConfiguration that is passed to the merge operation.

The main goal here is to allow more fine grained conflict resolution when performing a merge operation.

Created by Simon Urli on 2019/08/12

Get Connected