Compare merge conflict

[jceval]

When looking at and resolving merge conflicts, you are presented with the option to 'Compare Changes'

The resulting side-to-side split should allow you to resolve conflict by allowing you to select which side, left (current) or right (incoming) of the conflict you want to keep through the merge.

[vscodebot]

(Experimental duplicate detection)
Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:

• feature merge conflict & button tab not working (#72890)
• merge conflict resolution error (#74153)
• Merge conflicts: no way to go back from compare changes to diff view (#27562)
• Fix #38321 -- Provide navigation through git merge conflicts with codelens (#47884)
• Can provide a comparison&merge operations for git conflicts? (#76275)

[hediet]

With the introduction of the 3 way merge editor, it is unlikely that we will implement this feature soon.