Branching & Merging — feature branches, fast-forward vs no-ff, --squash
JuniorCollegepriority 1Sandbox & Interactive Quiz
This is the Sprint-1 stub for ai.careerplane.k12-education.college-student-engineering.git-version-control.branching-merging.
The fully-generated topic page (sandbox + quiz + AI hints + interactive
tooling) lands in Sprint-2 at
static/content/k12-education/College Student (Engineering)/Git & Version Control/Branching & Merging — feature branches, fast-forward vs no-ff, --squash/index.html
(per arch/memo.md → D-2026-04-22-13). The
//go:embed all:static directive auto-serves it on the next
container rebuild — no server-code change needed.
What this topic teaches
Git & Version Control skills for the
College Student (Engineering) career path.
gitbranchmergefast-forwardsquash
You should already know
Git Basics — init / clone / add / commit, .gitignore, HEAD vs working tree
Next up
Interactive Rebase — reorder, squash, edit, fixup; when NOT to rebase