I am having trouble getting this Github merge conflict Top-bar to resolve the conflicts in VSCode.

Have tried adding this command "editor.codeLens": true but no effect.

This is what i am getting after pulling the changes

And this is what i want after pulling.

Any help would be great. Thanks!

CodePudding user response：

There is an issue with the VSCode git extension, which can be resolved by disabling the Merge Editor option of the git extension:

path: settings > extensions > git > Merge Editor

Or by directly setting the following in the vscode's settings.json:

"git.mergeEditor": false

Also, DON'T NEED TO set editor.codeLens to true in the settings