Merge conflicts
A merge conflict requires choosing the intended combined change before completing the merge.
3 minutes. No sign-up needed.
This lesson is part of the AI Engineering course.
Example plan3 lessons · 13 min
Branches, remotes, and ignored files4 min
Merge conflictsGit version control3 min
Challenge: Git version controlGit version control6 min
An example. Your plan follows your answers, so it can start later and end sooner.
Build my plan
Start free, no account needed.