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