Consider the example in the attached file.
If I had a section which was deleted in one branch, and modified in another, BC picks the BASE by default.
This makes no sense at all. The sensible choice (by default) would be to leave local untouched, and mark this as a conflict.
If I had a section which was deleted in one branch, and modified in another, BC picks the BASE by default.
This makes no sense at all. The sensible choice (by default) would be to leave local untouched, and mark this as a conflict.
Comment