I am using Mercurial and it’s configured to open Beyond Compare when there is a conflict when merging. BC opens just fine and shows me the two files, but I have no idea what to do after that.
Normally in BC there are arrows next to the lines which differ where you can click on them to move the selection to the left or the right. No matter how I select a section I can not move code from one side to the other, or select a specific section as the one I want to keep. This UI is very consing. I basiclly can see the differences but don’t know how to tell BC which one I want to keep.
To perform a 3-way merge with Beyond Compare, you must have the “Pro” version. The “Standard” version does not support the feature.
Do you know which one you have?