Visual Studio Code 1.71 brings merge editor improvements
Visual Studio Code 1.71, the latest version of Microsoft’s popular code editor, introduces an easier transition between the text and merge editors, among a host of other improvements. Released September 1, Visual Studio Code 1.71 also is known as the August 2022 release.
Thanks to the merge editor improvements, a file that has a conflict now will automatically show an “Open in Merge Editor” button, enabling a swift transition between the text and merge editors. Also, VS Code no longer modifies the result file when opening it in the merge editor. Rather, the conflict markers remain in the file but are hidden in the result view. Check boxes allow you to replace the conflict markers with either side, a combination of both sides, or with the base.