VSCode merge conflict options not displaying

Question

I am working on an application in which I have merged my code to the repository after taking the git pull.The problem is that earlier it was showing the options like accept current change , accept incoming change, accept both the changes. But now it is not showing the options now , I have taken the pull and stash poped my code but no I am stuck as I cannot proceed further.

Below are the snapshots for better understanding

Any solution please ?

Answer 1

Merge the branch to activate vscode merge editor

here are the steps: what you have to do is go to the console/terminal a manually merge the branch that has the conflict into yours. So lets say for example that i was working on branch feat/#123/catalog and i wanted to merge into branch main or master or whatever branch you want your pull request for.

1. go to console/terminal
2. make sure you are on the branch with the changes then type git merge main and hit enter.
3. you will get a message that says Automatic merge failed; fix conflicts and then commit the result.
4. open vscode and click on the merge conflict files to use the merge editor

good luck 😉

Answer 2

UPDATE August 2022 (VSCode version 1.71): Looks like the VSCode team heard our cries, and the experience has been improved:

The old inline conflict decorators are no longer disabled, so the merge editor and inline experience can be used together.

A file that has a conflict will now automatically show an Open in Merge Editor button to transition between the text and merge editors.

---

The behavior came with the July 2022 update which enabled a new 3-way merge editor by default.

To use the new 3-way merge editor, see this answer to another question.

Answer 3

If you still struggle with this issue try to turn off Git: Merge Editor flag.