- 8 min read
How to revert a merge commit (and re-merge the branch later)
git revert refuses a merge commit until -m picks a parent. What the numbers mean, why re-merging the branch brings nothing back, and the Reapply escape.
- 9 min read
What FETCH_HEAD is, and why you shouldn't merge it
FETCH_HEAD holds whatever the last fetch brought — any fetch, including your editor's. Merge it by name and the branch can swap between your two commands.
- 10 min read
Will this merge conflict? Find out without merging
git merge-tree does the whole merge in memory and names every file that would conflict — without touching your working tree, your index, or your branch.