# Reflection: Your First Conflict Wasn't a Disaster

## Reflection questions

1. Before this module, how would you have reacted to seeing conflict markers in a real file
   for the first time?
2. What made resolving the conflict in this module's Lab feel manageable (or not)? What would
   make a REAL conflict, in a large unfamiliar file, harder?

## Real Ops takeaway

**Merge conflicts are one of the most feared parts of Git for beginners, and one of the most
routine parts of Git for experienced engineers — the difference is just repetition.** You've now
caused one on purpose, resolved it deliberately, and verified the result — exactly the
experience that turns "conflicts are scary" into "conflicts are Tuesday." Module 5 adds a real
remote to this same workflow; conflicts show up there too, and you're now prepared for them.

This module is complete. Continue to the next module.

## Instructor Notes

**Discussion questions for a live classroom:** question 2 is worth extending into "what would
make a conflict on a 500-line file, with someone else's unfamiliar code, actually hard" — a good
honest preview of real collaborative work.

**Approximate timing:** 5-8 minutes live discussion; 5 minutes self-paced writing.