在Visual Studio代码中如何在两个本地分支之间合并？ [英] In Visual Studio Code How do I merge between two local branches?

问题描述

在Visual Studio Code中，似乎只允许我推，拉和同步。有证明文件支持合并冲突，但我无法弄清楚如何在两个分支之间实际合并。 VSC中的Git命令行（按F1）只能使命令的子集简单化：

尝试从备用分支中提取或推送到备用分支产生：

以下是关于VSCode的Git
的文档 Visual Studio Code Git文档

我忽略了什么？

解决方案

版本控制文档没有提及合并命令，只是合并状态和冲突支持。

即使是 latest version June release 并没有为VCS的前端添加任何新功能。

一个href =https://github.com/Microsoft/vscode/issues/5770 =noreferrer> issue 5770 ，它确认你不能将VS Code用作git mergetool ，因为：

此功能是否包含在下一次迭代中可能吗？

可能不是，这是一个很大的努力，需要实现合并UI 。

这使实际的合并仅从命令行启动。

In Visual Studio Code it seems that I am only allowed to push, pull and sync. There is documented support for merge conflicts but I can't figure out how to actually merge between two branches. The Git command line within VSC (press F1) only facillitates a subset of commands:

Attempting to pull from a an alternate branch or push to an alternate branch yields:

Here's the documentation on VSCode's Git Visual Studio Code Git Documentation

What am I overlooking?

解决方案

The Version Control doc does not mention merge commands, only merge status and conflict support.

Even the latest 1.3 June release does not bring anything new to the VCS front.

This is supported by issue 5770 which confirms you cannot use VS Code as a git mergetool, because:

Is this feature being included in the next iteration, by any chance?

Probably not, this is a big endeavour, since a merge UI needs to be implemented.

That leaves the actual merge to be initiated from command line only.

这篇关于在Visual Studio代码中如何在两个本地分支之间合并？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！