Guided Notes

Merging & Conflicts

Fast-forward and three-way merges, what causes conflicts, and how to resolve them.

Merging a branch

Slide 1 / 5

Merging brings the commits from one branch into another. Switch to the branch that should receive the changes, then merge:

git switch main git merge feature/contact

After a successful merge, delete the finished branch: git branch -d feature/contact.

On GitHub, merging usually happens through a pull request, but the result is the same.

← Branching