Accept Incoming Change not appearing in VS Code

Question

I am trying to resolve merge conflicts into a branch using vs code. However the command palette to accept incoming changes is not appearing

Unlike here where the command palette is clearly visible at the top window.

How do I get those commands to appear at top of window?

Answer 1

In my case I had a different issue, my "Code Lens" was disabled.

You can go to Settings and search for "codeLens" to make sure it is enabled.

Answer 2

I suppose you're looking for this toolbar:

(Image from this Microsoft Repo)

This toolbar only appears when:

1. there are any merge conflicts and
2. the current file is in the "MERGE" section of VS Code's version control panel

From what I see in your screenshot, there is indeed a file in the "MERGE" section. I can't really tell whether that is also the file you've opened (Address.js).

Address.js seems to have no conflict markers. In git, conflict markers look like this:

<<<<<<< HEAD
    ...
=======
    ...
>>>>>>> master

In your case it seems like the change was merged by git automatically, without conflicts, which means the toolbar you're looking for won't show here.