Switch WinMerge from 3-way merge to 2-way merge #712
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The WinMerge preset in the application opens WinMerge in a 3-way merge configuration with theirs version on the left, ours in the middle and raw conflict file on the right:
This seems to be aligned with the advice on the internet, but provides suboptimal user experience. The fact that WinMerge doesn't have keyboard shortcuts to operate on the middle pane doesn't help either.
Winmerge supports opening conflict files directly, and for them it creates a 2 pane UI with theirs version on the left and ours on the right:
Ours is what is eventually saved when the conflict is resolved.
To me the latter appears to be much more useful, though I can see how someone may want to keep both ours and theirs in their view for the whole conflict resolution session.