The latest articles on DEV Community by Oskar Lindgren (@oskarlindgren). https://dev.to/oskarlindgren https://media2.dev.to/dynamic/image/width=90,height=90,fit=cover,gravity=auto,format=auto/https:%2F%2Fdev-to-uploads.s3.amazonaws.com%2Fuploads%2Fuser%2Fprofile_image%2F800949%2F336531fb-d572-4631-be25-eaa5a508607f.jpg https://dev.to/oskarlindgren en Oskar Lindgren Fri, 26 Aug 2022 07:55:54 +0000 https://dev.to/oskarlindgren/vs-code-disable-3-way-merge-editor-544d https://dev.to/oskarlindgren/vs-code-disable-3-way-merge-editor-544d <p>There has been a lot of comments regarding Microsofts decision to change the default Merge Editor in VS Code. See this Github Issue that blew up: <a href="https://github.com/microsoft/vscode/issues/157361">https://github.com/microsoft/vscode/issues/157361</a> 🔥</p> <p>TL;DR<br> To switch back to the regular Merge Editor make this change in your <code>settings.json</code><br> </p> <div class="highlight js-code-highlight"> <pre class="highlight plaintext"><code>"git.mergeEditor": false </code></pre> </div> <p>Also make sure that <code>merge-conflict.decorators.enabled</code> is <code>true</code> (which is the default). In my feverish attempt to disable the new 3-way Merge Editor I flipped a couple of switches I shouldn't have... :)</p> <p>Btw, there is a PR to change the default back to <code>false</code>: <a href="https://github.com/microsoft/vscode/pull/158544">https://github.com/microsoft/vscode/pull/158544</a></p> <p>Update: The PR has been closed. It seems the VSCode maintainers are determined to use the new merge editor, but make it easier to switch back. </p> vscode