Question

The question is straightforward: I have three heads (branches in this case), and I want to merge them into master (one of them being master). Let’s call these master, foo and bar. I know I could do two merges separately, but I’ve heard it can be done once and I want to try.

Answer 1

Just do the following:

git checkout master
git merge foo bar

That will merge the two branches into master…this works for any number of branches – only if there are not merge confilcts in this “octopus merge”
The git log –graph will look something like this.

|    
*-.  
|\ \ 
| | |
| | |