Advanced
Conflict Resolution Without Rewriting History Blindly
Practice resolving messy conflicts in long-lived branches, using rerere safely, and knowing when to involve a second reviewer. Includes scenarios with generated CSV and lockfile clashes.
What arrives in your repo
- Conflict triage decision tree
- rerere sandbox with guided resets
- Binary and lockfile exercises
- Pairing scripts for sensitive merges
- Post-merge verification checklist
- Communication templates for freeze windows
- Mentor-reviewed conflict write-up
Outcomes we ask you to evidence
- Resolve multi-file conflicts with a clear narrative
- Know when to abort and request design input
- Document resolutions for downstream teams