Ideally (for me) when doing a 3-way merge, beyond compare would take changes from the base revision on the trunk, and changes from the base revision on the branch, and mark a conflict if a section changed in both(and wasn't the same).
Instead I see that it normally favors the right, and (IMO) oddly if the changes occurred in both the trunk and the branch, selects the base (in that case I would expect it to select the branch or the trunk...it doesn't matter).
I would expect this would be the way people would normally like to work. Am I missing something? Is there an option to make it work that way?
Instead I see that it normally favors the right, and (IMO) oddly if the changes occurred in both the trunk and the branch, selects the base (in that case I would expect it to select the branch or the trunk...it doesn't matter).
I would expect this would be the way people would normally like to work. Am I missing something? Is there an option to make it work that way?
Comment