VSCodeTips

VSCodeTips is a community of 1,087 amazing vscoders

We're a community that shares tips & tricks on how to best leverage VS Code

Create account Log in
Cover image for VS Code Tip of the Week: 3-way Merge Editor
Nick Taylor
Nick Taylor

Posted on

VS Code Tip of the Week: 3-way Merge Editor

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.

VS Code command palette with the word settings typed in it showing a filtered list of commands that have the word settings in them

VS Code Settings (GUI) view with the word merge entered in the search to filter settings with the word merge in them

Make sure to check Git: Merge Editor

The Git: Merge Editor user setting checked

And that's it and you are good to go!

Git 3-way merge editor in action in VS Code

Discussion (0)