|
|
|
|
|
|
by seba_dos1
3 days ago
|
|
|
Setting: merge.conflictStyle = zdiff3
made most of my fears regarding conflict resolution go away, as it right away gives me the stuff that I used to look for manually to understand the context of the conflict, which was probably the most error prone part of the process. |
|
|