CODEWITHSUNDEEP
visual-studio-codeconfigconflict
Creabine
Creabine

Reputation: 829

Vscode merge conflict with yellow square

somehow my vscode changed, when i want to resolve merge conflict,there is something like <<<<HEAD , but now it's like a yellow square on picture, why is that? can anyone tell me why?

enter image description here

Upvotes: 51

Views: 9782

Answers (4)

JP Connolly
JP Connolly

Reputation: 11

If you don't want to remove this feature, there should be a checkbox to the left of each yellow box which you can use to select the conflict(s) that you would like to persist (similar to how the old merge conflict control worked)

Upvotes: 1

Harrison Ho
Harrison Ho

Reputation: 89

Go to settings -> find "Git Merge Editor" -> disable "Git: Merge Editor"

Turn off Visual Studio Code merge editor

Upvotes: 7

Creabine
Creabine

Reputation: 829

I finally fix this by these configs

"diffEditor.codeLens": true,
"git.mergeEditor": false

Upvotes: 31

user12784070
user12784070

Reputation: 581

In the user settings, you can disable Git Merge Editor:

VS Code Settings Screenshot

img

Upvotes: 58

Related Questions