CODEWITHSUNDEEP
gitvisual-studio-code
Shahar Kazaz
Shahar Kazaz

Reputation: 1206

vscode - Merge one branch into another

Is it possible to merge one branch into another using the vscode interface and not the terminal? or is there any extension that makes this possible?
using vscode v1.13.0
Thanks in advance.

Upvotes: 11

Views: 18491

Answers (3)

Peter Pointer
Peter Pointer

Reputation: 4162

Use Git: merge branch command

VSCode now has built-in branch merge support.
see In Visual Studio Code How do I merge between two local branches?

Press Ctrl/Cmd+Shift+P (Or View > Command Palette...) and look for Git: merge branch.

You select the branch to merge from (if you have a workspace open, the command lets you choose the project within the workspace).
Conflict management is also implemented, highlighting the Git conflict markers (see link above).
The branch gets merged with the commit message "Merged branch '[branchname]'"

Upvotes: 11

Shahar Kazaz
Shahar Kazaz

Reputation: 1206

I have created an extension which is available under the name: Git Merger in the vscode marketplace.

Upvotes: 9

YoannFleuryDev
YoannFleuryDev

Reputation: 941

Nowadays (2017-06-14) you can't, there is no extension to do so in VSCode. If you have time and skills, you can try to write your own extension, you're probably not the only one to want a feature like that, so you'll find contributors if you host it on Github for example.

You'll use the terminal a bit more. Sorry.

Upvotes: 0

Related Questions