⚡ git merge · visual pro
HEAD:
main
⬆️ move pointer
fast‑forward
🧩 two+ parents
merge commit
📋 commit graph
live
o (main) first commit
│
o second
│
o (feature) third
✨ base: main behind feature (fast‑forward possible)
fast‑forward
three‑way
--no-ff
squash
octopus
conflict
-X theirs
-s ours
rebase
⚙️ command
🔷 1 · fundamental merges
— select core action —
🔀 fast‑forward merge
🌉 three‑way (true merge)
🚫 --no-ff (no fast forward)
📦 squash merge (--squash)
🐙 octopus (3 branches)
⚔️ 2 · conflict & strategies
— choose strategy —
⚔️ merge with conflict
🛡️ ours (-s ours)
🎭 -X theirs (auto resolve)
🧠 ORT / recursive
🌲 subtree strategy
⏯️ 3 · flow & modifiers
— manage / alter —
⏹️ merge --abort
▶️ merge --continue
🔁 rebase (alternative)
🍒 cherry-pick (commit F)
🌿 --allow-unrelated-histories
🔏 --gpg-sign
⟲ reset to base graph
⬆️ ff
🧩 3‑way
🐙 octopus
⚔️ conflict
🎭 theirs
⏹️ abort