Merge

Combine branches with fast-forward and 3-way merge

Merging combines two branches. The method depends on whether the branches have diverged.

When main hasn't diverged, Git just moves the pointer forward. No merge commit needed.

main

feature

Terminal

$ git checkout main
$ git merge feature
Updating a1b2c3d..d4e5f6a
Fast-forward
 2 files changed, 30 insertions(+)

8 / 20