#Merge
3 posts
7 min read
Practical Git Workflows #4: Resolving Conflicts — Structure, mergetool, and rerere
Understand conflicts through the base, ours, and theirs structure and handle them with tools. Why ours and theirs look flipped during a rebase, zdiff3 markers, the VS Code merge editor, and rerere so you never solve the same conflict twice.
7 min read
Practical Git Workflows #2: rebase vs merge — Decision Criteria and the Golden Rule
See through diagrams how rebase re-applies commits as brand-new ones, and build criteria for choosing between rebase and merge. Includes the structural reason you must never rebase a shared branch.
7 min read
Git Basics #3: Branching and Merging — Fast-forward and 3-way
From the fact that a branch is a lightweight pointer to a commit, through the difference between fast-forward and 3-way merges, to reading conflict markers and resolving them.