Using BC 4.1.2 x64 and git 2.10.1.windows.1 on Win 10 x64.
If I use BC4 to resolve a merge conflict (via git mergetool), it seems that, if I only resolve *some* of the conflicts, saving causes two fundamental problems:
Am I missing something fundamental here? I am merging changes to a fairly complex XML file if that adds anything to the discussion.
This is a bit of showstopper to purchasing BC4 licenses.
If I use BC4 to resolve a merge conflict (via git mergetool), it seems that, if I only resolve *some* of the conflicts, saving causes two fundamental problems:
- the unresolved conflicts disappear, and the file gets some garbled version of them (selected bits of the two conflicted changes without any conflict markers);
- git sees the conflicts as resolved (i.e., BC4 gives a 'successful' exit code).
Am I missing something fundamental here? I am merging changes to a fairly complex XML file if that adds anything to the discussion.
This is a bit of showstopper to purchasing BC4 licenses.
Comment