Skip to content
masterclass Buddy
Start learning

Git · Concept

Fast-forward merge

Git merge combines another commit or branch with the current branch. It either fast-forwards the current branch or creates a merge commit; conflicts require manual resolution.

Last updated

Syntax

git merge [<options>] [<commit>…​]

In-depth API docs are only for subscribers: parameters, examples, common mistakes and interview practice.

Subscribe
  • git pull
  • git ls-files -u
  • git merge --abort
  • MERGE_HEAD
  • HEAD
  • --no-ff
  • --ff-only

Source: Git - git-merge Documentation. Checked 2026-11-03.