Merge Conflicts — rerere, 3-way diff tools, resolve then abort vs continue
JuniorProfessionalpriority 1Sandbox & Simulation
This is the Sprint-1 stub for ai.careerplane.marketing-sales.technical-seo-manager.git-version-control.conflict-resolution.
The fully-generated topic page (sandbox + quiz + AI hints + interactive
tooling) lands in Sprint-2 at
static/content/marketing-sales/Technical SEO Manager/Git & Version Control/Merge Conflicts — rerere, 3-way diff tools, resolve then abort vs continue/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
Technical SEO Manager career path.
gitmergeconflictrererediff3
Next up
git stash & git worktree — Parallel Branches Without Context Loss