In Visual Studio Code How do I merge between two local branches?
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?
Update June 2017 (from VSCode 1.14)
The ability to merge local branches has been added through PR 25731 and commit 89cd05f: accessible through the "Git: merge branch" command.
And PR 27405 added handling the diff3-style merge correctly.
Vahid's answer mention 1.17, but that September release actually added nothing regarding merge.
Only the 1.18 October one added Git conflict markers
From 1.18, with the combination of merge command (1.14) and merge markers (1.18), you truly can do local merges between branches.
Original answer 2016:
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.
- How can I unlock my gemfile so I can access the rails server?
- How to deploy a Java web application on OpenShift or Git?
- How to Use Yarn Version command to update to released version from prerelease version
- Add Change-Id to all commits
- How can one change the timestamp of an old commit in Git?
- How do I get the hash for the current commit in Git?
- Git Ignore strangeness
- key_load_public: invalid format
- Are there any other "special git commit messages" than [skip ci]?
- limit number of commits to push on remote
- How to undo merge of master branch?
- Commit hash for git revert?
- Break a previous commit into multiple commits
- Git interactive unstage part of a file or by hunks
- local cache for a github repository?
- Git-hook to show if I've got a stash on the checked out branch
- What's the difference between HEAD, working tree and index, in Git?
- How do you stop tracking a remote branch in Git?
- Search all files of all commits in git log for specific string
- How to log first 10 commits in Git
- intended flow when git stash pop gets conflicts
- How to get default Git branch?
- Setting up SSH keys for Bitbucket on Windows
- error: pathspec 'test-branch' did not match any file(s) known to git
- git add <filename> not working
- Two different projects sharing secret.json locally
- git force push to upstream remote branch of PR
- Weird IP Address while GIT pull
- Will a git push be interrupted if my computer's internet connection is dropped temporarily?
- moving changed files to another branch for check-in