Rebase failures mid-stack are painful to recover from. Add checks before starting any rebase:
- Merge commits in feature branches — detect with
git rev-list --merges, warn and abort unless --force
- Stale metadata — detect when
parent_head doesn't match reality after out-of-band operations
ez move stale history — check ancestor relationship before replaying commits- Cherry pre-check — use
git cherry to find redundant commits before rebasing; skip rebase entirely if all redundant
Rebase failures mid-stack are painful to recover from. Add checks before starting any rebase:
git rev-list --merges, warn and abort unless--forceparent_headdoesn't match reality after out-of-band operationsez movestale history — check ancestor relationship before replaying commitsgit cherryto find redundant commits before rebasing; skip rebase entirely if all redundant