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?
This question is related to
git
visual-studio-code
I had the same question, so I created Git Merger.
hope this helps :)
I found this extension for VS code called Git Merger. It adds Git: Merge from
to the commands.
You can do it without using plugins.
In the latest version of vscode that I'm using (1.17.0) you can simply open the branch that you want (from the bottom left menu) then press ctrl+shift+p
and type Git: Merge branch
and then choose the other branch that you want to merge from (to the current one)
Source: Stackoverflow.com