接受未出现在 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.

Answer 3

In VScode settings (cmd + P , json settings) set:

  "editor.codeLens": true,

Mine was set to false and the commit actions weren't showing up.

Taken from the links in @Teresa Kozeras answer.

Set to True:

Set to False:

This isn't exactly the question OP asked, but it's the one I was having when google brought me here.

Answer 4

I hope this help somebody. If the Accept Current Changes and stuff does not appear when git rebasing.

Just cut the greater than >>>>>>>> [Commit message] and paste it in any lines after the equal ======= signs and within those signs are the codes for Accept Incoming Changes .

Answer 5

First, as I found out, there are two types of related views, a diff/compare view (red/green lines) and a conflict (azure lines as seen in you gif) view.

IF you have a merge conflict, the file in the sidebar will be put under "MERGE CHANGES", and you can click it and it opens like a regular file (just the filename in the tab and nothing else).

However, I had a problem of not seeing any conflict highlighting or toolbar to accept or revert changes, until I figured that it doesn't scroll to the conflict automatically (I had a 40k lines file), and the only way you can spot conflicts as far as I can see, is in the scrollbar with small azure colorings. Then when you scroll to them, the conflict and related actions appear. That's on VS Code, I think, to implement such changes (auto scroll to first conflict, as well as separate buttons to go to next/previous conflict). There are keybind options, though.

Cheers

Answer 6

对我来说禁用 GitLens 有帮助： https ://github.com/eamodio/vscode-gitlens/issues/319 https://github.com/eamodio/vscode-gitlens/issues/344

Answer 7

Try to change "git.mergeEditor": false in your VS code settings.

Answer 8

In case someone still can't solve this issue. You can turn off the Git: Merge Editor from Setting menu.

VSCode merge conflict options not displaying

Answer 9

What resolved this for me was to disable Git Merge Editor. You can find this in File > Preferences > Settings and then search for Git Merge Editor. After unticking the box, you should restart VS Code.

Answer 10

I had the same problem after having some strange update issue with vscode. I just had to uninstall and install the latest(1.27.1 at the time of writing) version of vscode and it worked again.

Answer 11

This just happened to me too, the solution for me was to open settings (command+comma), search for merge, and disable Git: Merge Editor.

Answer 12

Below is the most simple, easy and fast way for all:

Disable Git Merge Editor .

1. Go to File > Preferences > Settings in VS code
2. Search for Git: Merge Editor.
3. Untick the check box and restart Vs Code

Enjoy!!!!!!!!!!!!!!!!

Answer 13

我有同样的问题，我挣扎了几个小时，但没有任何效果，然后通过重新启动 vs 代码解决了问题

Answer 14

You may not also be able to see "Accept Change(s)" because recently VS Code introduced Git merge editor , which is now enabled by default.

It allows you to view and resolve merge conflicts by clicking on a conflicting file in the Source Control view instead. You can turn it off to go back to "Accept Change(s)", though I think it's better.

Add this line to VS Code user settings.json to turn merge editor off: "git.mergeEditor": false

I'm attaching screenshots for anyone want to compare merge.editor off & on.

Git merge editor - off

Git merge editor - on

Answer 15

只需剪下 >>>> 并将其在 ==== 之后的任何行中过去，这将使工具栏出现。