BUILDS ON
TOPICS
#8
Branching
Write one 41-byte file to branch with nothing copied, watch a switch rewrite every working file to another snapshot while your commits hold still, drive two branches into divergence, and see why `-d` refuses before it strands a commit.
12 min
#9
Merging
Drive two branches to divergence and watch one reachability check pick the write: a reachable tip fast-forwards a 41-byte ref with no new commit, a diverged tip builds a merge commit with two `parent` lines, and standing on the other branch swaps which is first parent.
14 min
#10
Merge Conflicts
Halt a merge on one overlapping line, read the disagreement as marker blocks, three index stages, and a MERGE_HEAD flag, flip between merge, diff3, and zdiff3 rendering, then stage the fix into a two-parent commit or abort clean.
12 min