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]>
33 lines
1.2 KiB
Markdown
33 lines
1.2 KiB
Markdown
# Knowledge Check: Engineering Git Workflow
|
|
|
|
---
|
|
|
|
**1. Why does bundling unrelated changes into one commit cost you something real, not just
|
|
style points?**
|
|
|
|
*Answer:* It makes precise operations like `git revert` impossible to apply to just ONE logical
|
|
change — reverting the commit reverts everything in it together, whether you want that or not.
|
|
|
|
---
|
|
|
|
**2. Why do teams typically restrict direct, unreviewed pushes to `main`?**
|
|
|
|
*Answer:* `main` is the shared source of truth everything else (deployments, other branches) is
|
|
built from — protecting it reduces the chance an unreviewed mistake reaches something everyone
|
|
else depends on being trustworthy.
|
|
|
|
---
|
|
|
|
**3. Name one concrete way this course's Git discipline connects to GitOps or CI/CD.**
|
|
|
|
*Answer:* Any reasonable answer connecting small deliberate changes / a trusted source of truth
|
|
/ review-before-merge / reliable history to how CI/CD pipelines trigger on pushes or how GitOps
|
|
treats a Git repository as the authoritative record of desired infrastructure state.
|
|
|
|
## Instructor Notes
|
|
|
|
**Facilitation:** Question 3 is open-ended by design — the goal is students making the
|
|
connection in their own words, not reciting a fixed answer.
|
|
|
|
**Approximate timing:** 5 minutes.
|