Merges and conflicts
Merging combines changes, and a conflict requires a deliberate choice between competing edits.
3 minutes. No sign-up needed.
This lesson is part of the Software engineering course.
Example plan3 lessons · 9 min
Branches3 min
Merges and conflictsVersion control with Git3 min
Remote repositoriesVersion control with Git3 min
An example. Your plan follows your answers, so it can start later and end sooner.
Build my plan
Start free, no account needed.