Vscode merge conflict with yellow square

user_19700025 0
Viewed 6420

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

visual-studio-code config conflict
4 Answers

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

VS Code Settings Screenshot

img

user_127840700

I finally fix this by these configs

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

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)

user_198303930
Related