If you haven't already, grab the June 2022 Release of VS Code! If you're on Insiders, then there's nothing you need to do.
There are all kinds of goodies in the release, but this week's tip is a new feature that landed in VS Code. The 3-way Merge Editor. 🔥
One thing you'll need to do to enable it is add git.mergeEditor: true to your user settings. If you prefer the GUI for settings, then navigate to the git section.
Make sure to check Git: Merge Editor
And that's it and you are good to go!
Top comments (9)
I really don't like how they are referring to this as a 3-way merge editor. It's a 3-pane merge editor. 3-way merge editors show you the base version as well, with 4 panes total: Left, Base, Right, Result.
Shameless plug: How to disable the new default (horrible) 3-Way Merge Editor: dev.to/oskarlindgren/vs-code-disab...
To each their own. 😎
Thank you! This is really terrible design.
Why they hell did they force this nonsense on us?
I guess M$ fired all of their UI/UX designers. Just look at Wndows 11.
Looks pretty but works like hot garbage.
new mege editor is total trash
I actually have no idea why somebody wants to use it. The previous one was just perfect.
tbh this is better since it's easier to merge between lines. it's the same feature like on the webstorm
Some folks do. I’m in your boat though. I still prefer the old way. Maybe, that’ll change over time.
It would be good if you show some up-close screenshots showing the ticket box selection next to each conflict. Most people don't get how it works and ends in frustration.
E.g, click the tick box either side of the conflict and it appears below. You can then edit the below box if needed.