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]>
1.1 KiB
1.1 KiB
Reflection: The Model Explains the Commands, Not the Other Way Around
Reflection questions
- Before this module, would
git addbeforegit commithave seemed like an unnecessary extra step? Why does it actually matter now? - Which of the three areas (working tree, staging, repository) do you feel least confident distinguishing? What would help solidify it?
Real Ops takeaway
Every Git confusion you'll ever hit traces back to one of these three areas. "Why isn't my
change in the commit," "why does git status show something weird," "why did my commit include
something I didn't mean to" — all of them are answerable by asking "which of the three areas is
this change actually in right now?" You now have that question available; Module 3 makes it
muscle memory.
This module is complete. Continue to the next module.
Instructor Notes
Discussion questions for a live classroom: question 2 is worth a quick poll — knowing where the class is least confident tells you where to slow down in Module 3's hands-on Lab.
Approximate timing: 5-8 minutes live discussion; 5 minutes self-paced writing.