Back
Syntax
Study
Editor
Mode:
HTML
CSS
JavaScript
PHP
Reset
Run »
HTML / CSS / JS
# ---- Fast-forward merge ---- # main: A - B # feature: C - D # (main has not moved since feature branched off) git switch main git merge feature/add-button # Fast-forward: main pointer moves to D, no merge commit created. # main: A - B - C - D # ---- 3-way merge ---- # main: A - B - E # feature: C - D # (both branches have new commits) git switch main git merge feature/user-login # Git creates a merge commit M: # main: A - B - E - M # \ / # C - D # Prevent fast-forward (always create a merge commit): git merge --no-ff feature/add-button -m "Merge feature/add-button" # See a graph of the merge: git log --oneline --graph # Abort a merge in progress: git merge --abort
Result
Open