Apply, merge, rebase, commit, squash

squash, pick, edit, cherry, exec

Reword, edit, squash, pick, fixup, exec

Pick, rework, edit, squash, fixup, exec

To merge 3 or more branches

To merge 8 branches (octo means 8)

There is not such strategy

Used if resolve doesn’t work

Ideology when you merge before story is done or passed review

When git knows, you need merge before You

When git can switch branch to new commit without merge commit

There is no fast-forward merge

Theirs

Ours

Recursive

Resolve

Git checkout --theirs [file]

Git checkout --ours [file]

Git checkout --remote [file]

Git remote –checkout [file]

It’s impossible

Git merge –one-commit

Only by git reset [commits], git add and git commit

Git merge –squash