New blog post: Merge conflicts in the classroom

It’s going to happen one day. One of your students tries to merge one branch into another, and the dreaded error appears:

CONFLICT (content): Merge conflict in filename.ext Automatic merge failed; fix conflicts and then commit the result.

Use this handy guide to help with merge conflicts in your classroom this fall.