Merge conflicts

Learning outcomes

Learners ...

• understand what a merge conflict is
• can fix merge conflicts

For teachers

Prior:

• When would your version control system reject your push?
• What is a merge conflicts?
• Why can't merge conflicts be resolved automatically?