ced4568/rootnode-academy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(root03): author Git & Collaborative Development

Browse Source 
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]>
This commit is contained in:
ced4568
2026-08-26 17:08:00 -05:00
co-authored by Claude Sonnet 5
parent e007bcf000
commit e68b6f445a
33 changed files with 1393 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/root/root-03-git-collaborative-development/m06-engineering-git-workflow/04-reflection.md
+30
View File
@@ -0,0 +1,30 @@
# Reflection: You've Practiced Real Engineering Discipline, Not Just Syntax
## Reflection questions
1. Look back across all six modules of ROOT 03. Which single habit (small commits, checking
`git status` before staging, fetch-before-pull, resolving conflicts deliberately) do you
think will matter most in real work?
2. This course started with "copying files as backup isn't version control." Can you now
explain, in one sentence, what Git actually gives you that copying never could?
## Real Ops takeaway
**Version control discipline is not a Git-specific skill — it's an engineering discipline that
happens to be exercised through Git.** Small deliberate changes, a trusted shared source of
truth, review before permanent history, and confident rollback are the same principles behind
CI/CD, GitOps, and Infrastructure as Code, all covered later in ROOT 11. You are not starting
that content from zero — you already practiced its foundation here.
This module — and ROOT 03 — is complete. Continue to ROOT 04: Containers & Docker.
## Instructor Notes
**Discussion questions for a live classroom:** question 2 is a good closing check — a clear,
confident answer here is real evidence the course's central premise landed.
**Approximate timing:** 8-10 minutes live discussion; 5 minutes self-paced writing.
**Milestone note:** this is the last module of ROOT 03 — consider a brief recap connecting all
six modules (why version control → the three-area model → everyday commands → branching/
conflicts → remotes → professional workflow) before moving to ROOT 04.