Git Branch and Merge

Understand branches as movable commit references, distinguish fast-forward from a merge commit, and resolve conflicts without assuming correctness.