master | + setup | + chapter-03-01 | + chapter-03-02 | + chapter-03-03
git merge <b1> <b2> <b3>...
从文章中可以看出 – 您可以看到许多分支有多个合并
This resolves cases with more than two
heads, but refuses to do a complex merge that needs manual resolution.
It is primarily meant to be used for bundling topic branch heads
together. This is the default merge strategy when pulling or merging
more than one branch.
这个默认的合并策略：git merge b1 b2 … bn,是章鱼.
This option forces conflicting hunks to be auto-resolved cleanly by favoring our version.
Changes from the other tree that do not conflict with our side are reflected to the merge result. For a binary file, the entire contents are taken from our side.
This should not be confused with the ours merge strategy, which does not even look at what the other tree contains at all. It discards everything the other tree did, declaring our history contains all that happened in it.