#news #uiux VS recently got updated and "continued working on the" 3-way merge editor that you can see on the screenshot. Who knows how, but it got enabled in my vscode automatically. without further ado: - VS Settings - Git: Merge Editor - Untick - Go on with your life code.visualstudio.com/updates…es/v1_69