将多个分支合并为一个

Question

Can I use git extensions app to merge multiple branches into one. Let's say I have multiple branches, each for a c++ class. I make some modifications to some classes, which means commiting to different branches. Now a merging will be easy since no conflicts are possible. How can I reduce the painful job of doing manually all the multiple branches merging with only one command using git extensions (or other way)?

Answer 1

普通的旧git merge ，只列出所有分支名称。

Answer 2

This is possible using Git Extensions. Switch to the branch you want to add the other branches to and then bring up the "Merge branches" dialog by using the keyboard shortcut "Ctrl+M".

Next to the dropdown where you can select a branch to fetch changes from there is a button. Clicking this button will bring up a new window where you can select multiple branches to bring in changes from. The result of this will be that the names of all the selected branches now appear in the dropdown textarea.

There you go. =)