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]>
37 lines
1020 B
Markdown
37 lines
1020 B
Markdown
# Knowledge Check: Git Mental Model
|
|
|
|
---
|
|
|
|
**1. Name the three areas a file passes through, in order.**
|
|
|
|
*Answer:* Working tree → staging area → repository (commit history).
|
|
|
|
---
|
|
|
|
**2. What does `git add` actually do, in terms of this model?**
|
|
|
|
*Answer:* Moves a change from the working tree into the staging area — marking it as ready to
|
|
be included in the next commit.
|
|
|
|
---
|
|
|
|
**3. If you edit three files but only `git add` one of them, what happens when you `git
|
|
commit`?**
|
|
|
|
*Answer:* Only the staged file is included in the new commit — the other two edited-but-unstaged
|
|
files remain as uncommitted changes in the working tree.
|
|
|
|
---
|
|
|
|
**4. What is HEAD?**
|
|
|
|
*Answer:* Git's pointer to the commit you're currently looking at — almost always the tip of
|
|
whichever branch you have checked out.
|
|
|
|
## Instructor Notes
|
|
|
|
**Facilitation:** Question 3 is the single most important check in this module — if students
|
|
get this wrong, revisit the diagram before continuing to Module 3.
|
|
|
|
**Approximate timing:** 5 minutes.
|