接受未出现在 VS Code 中的传入更改 [英] Accept Incoming Change not appearing in VS Code

问题描述

我正在尝试使用 vs 代码将合并冲突解决到分支中.然而，接受传入更改的命令面板没有出现

与

(图片来自这个 Microsoft Repo)

此工具栏仅在以下情况下出现:

1. 存在任何合并冲突和
2. 当前文件位于 VS Code 版本控制面板的MERGE"部分

从我在你的截图中看到的，MERGE"部分确实有一个文件.我真的不知道这是否也是您打开的文件(Address.js).

Address.js 似乎没有冲突标记.在 git 中，冲突标记如下所示:

<代码><<<<<<<<<<<<头...========...>>>>>>掌握

在您的情况下，更改似乎是由 git 自动合并的，没有冲突，这意味着您要查找的工具栏不会显示在此处.

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?

解决方案

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.

这篇关于接受未出现在 VS Code 中的传入更改的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！