note

teaching: 15 minutes

exercises: 0 minutes

questions:

• What do I do when my changes conflict with someone else’s?

objectives:

• Explain what conflicts are and when they can occur.
• Resolve conflicts resulting from a merge.