Vscode merge conflict with yellow square May 2, 2023 by Tarik In the user settings, you can disable Git Merge Editor: VS Code Settings Screenshot
