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 ?

check this link "https://stackoverflow.com/questions/47241098/accept-incoming-change-not-appearing-in-vs-code/47248481" or "https://stackoverflow.com/a/51627902/10805479" — Ravi Ashara, May 26 '21 at 10:37
Ravi Ashara : it is not working fully. Any other possible solution — Mohit Kumar Sharma, May 26 '21 at 10:51
your "Code Lens" is enable?? or close vs code and open again — Ravi Ashara, May 26 '21 at 11:03
I am also having the same issue, checked in the link above but nothing works, tried delete and reinstall, but still no luck — fizmhd, Nov 15 '21 at 12:06

score 85 · Answer 1 · answered Aug 09 '22 at 07:57

85

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

answered Aug 09 '22 at 07:57

Nata

971
4
5

2

Thank you! you have any idea why it happens? – vexingCoder Aug 09 '22 at 09:55
4

Thanks! It saved my day, but I still wonder why it happens. Is there a PR to VSCode for this? – Filippo Alberto Edoardo Aug 09 '22 at 13:16
1

Thanks, It just saved a lot of time @nata – hhhameem Aug 11 '22 at 05:33
3

This worked, don't know if it has anything to do with latest update of VScode – Stanley Aloh Aug 11 '22 at 19:44
2

The behavior came with the [July 2022 update](https://code.visualstudio.com/updates/v1_70#_3way-merge-editor-improvements) which enabled a new 3-way merge editor by default. This solution was also proposed in [a GitHub issue comment](https://github.com/microsoft/vscode/issues/158674#issuecomment-1222418061). – victorlin Aug 23 '22 at 18:45

victorlin · Answer 2 · 2022-09-12T23:02:02.357

11

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.

New VSCode 3-way merge editor enabled by default in the July 2022 update

edited Sep 12 '22 at 23:02

answered Aug 23 '22 at 18:51

victorlin

638
7
14

7

The update expects a change of developer behaviour: Now when you want to resolve a conflict you have to go to the Source Control view and do it through there. Whereas before it was assumed that you wanted to do that when viewing a file in Explorer. Not a good change for me. – powlo Aug 30 '22 at 15:19
1

@powlo see edit – the experience was improved in the August 2022 update. – victorlin Sep 12 '22 at 23:03

score 1 · Answer 3 · answered Oct 12 '22 at 16:16

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.

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

good luck

VSCode merge conflict options not displaying

3 Answers3

Merge the branch to activate vscode merge editor

Linked