Allow to perform custom decisions in case of merge conflict

Last modified by Vincent Massol on 2019/12/12

The Diff module now offers new APIs to enhance the 3-way merge operation. The MergeResult is now capable of returning a list of Conflict objects which gives some information about the conflicts that occurred during the merge. Those conflicts can be solved on a case-by-case basis by specifying 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.

Tags:
Created by Simon Urli on 2019/08/12
   

Get Connected