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: You Have Real, Permanent History Now
Reflection questions
- Look at your own
git logfrom this module's Lab. Is your commit message something a stranger (or future-you) could understand without more context? - Which of the six commands from this module do you expect to type the most, going forward?
Real Ops takeaway
A real, permanent, inspectable history of your work now exists — this is the actual thing Module 1 named as missing from copy-a-file-as-backup. Every commit you make from here on is recoverable, comparable, and explainable. Module 4 builds on this by letting multiple lines of work (branches) develop independently before combining — impossible without the reliable history you just built the habit of creating.
This module is complete. Continue to the next module.
Instructor Notes
Discussion questions for a live classroom: question 1 works well as a peer-review pass — have students read a neighbor's commit message and guess what it changed, then compare.
Approximate timing: 5-8 minutes live discussion; 5 minutes self-paced writing.