Day 6 of 10 30 minFast-forwardMerge commitConflicts
Bring branches back together. Understand fast-forward and three-way merges, and resolve merge conflicts calmly, step by step.
By the end of today you can
- Merge a branch into main with git merge
- Tell a fast-forward merge from a merge commit
- Read conflict markers and resolve a conflict
- Abort a merge that went wrong
What's inside
- 6 sections
- 4 diagrams and mind maps
- 5-question quiz
- 1Merging: the basics
- 2Case 1: fast-forward
- 3Case 2: a merge commit
- 4Conflicts: when Git needs you
- 5Resolving a conflict, step by step
- 6Avoiding painful conflicts
Sign in free to read this lesson
Get the full lesson with diagrams, runnable code and the quiz. Your progress is saved across devices.
Sign in free