ced4568andClaude Sonnet 5
e68b6f445a
Adds all 6 ROOT 03 modules (why version control exists, the Git mental model, everyday Git, branching & merging, remote repositories, engineering Git workflow) — 31 activities. Uses only real LOCAL Git repositories throughout — no Gitea account, no network access, and no RootNode-canonical-repo credential is ever needed or exposed in a student Lab (docs/ROOT_FOUNDATIONS_LAB_STRATEGY.md §4). Modules 1, 2, and 6 are conceptual bookends with no lab, matching the flexible readiness standard already used in ROOT 01/02. Adds 3 new hands-on Git scenarios plus 2 MCQs: git-everyday-basics (init/add/commit, validated by inspecting real `git log`/`git show` state, not just command output strings — Step 6's explicit requirement), git-branching-and-merge (a REAL merge conflict caused on purpose by two branches editing the same line, resolved by the student, validated by confirming the conflict markers are gone and a real two-parent merge commit exists), and git-remote-clone-push (a real local bare repository standing in for a remote — clone/commit/push validated by inspecting the REMOTE side directly, not just the student's own clone). All tested end-to-end via the real scenario-validation API, including negative tests. Wires rootnode-git-fundamentals-assessment (2 required + 3 random-draw scenarios) using the existing Phase 3B assessment engine. Co-Authored-By: Claude Sonnet 5 <[email protected]>
27 lines
1.2 KiB
Markdown
27 lines
1.2 KiB
Markdown
# 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.
|