vscode - Merge one branch into another
I have created an extension which is available under the name: Git Merger in the vscode marketplace.
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]'"