This (now?) overlaps a lot with the `How we "merge"` section above. The rebase command isn't consistent, putting `-i` at the end.