• Merge branches fixes and enhancements on top of the current
branch, making an octopus merge:
$ git merge fixes enhancements
• Merge branch obsolete into the current branch, using ours
merge strategy:
$ git merge -s ours obsolete
• Merge branch maint into the current branch, but do not make a
new commit automatically:
$ git merge --no-commit maint
This can be used when you want to include further changes to
the merge, or want to write your own merge commit message.
You should refrain from abusing this option to sneak
substantial changes into a merge commit. Small fixups like
bumping release/version name would be acceptable.
