Doesn’t that mean you have to fix all the merge conflicts introduced by your commits on every rebase though?
rerere can help, but OP probably has their own workflow
Re:Git Rebase for the Terrified
by chuckadams on Tuesday January 13, 2026 @12:32PM
(#46604437)
Git has gotten pretty smart about that recently: once you resolve a conflict, if you get the same conflict again it automatically resolves it the same way. Works for both rebase and merge.
if you don't have a merge from main into the branch further down, then git only bothers you about the most recently introduced conflicts conflicts --- the ones you'd have to resolve anyhow, and it remembers how you've resolved those.
Re:Git Rebase for the Terrified
by cryptonector on Tuesday January 13, 2026 @04:15PM
(#46608152)
You'd have merge conflicts whether you merge or rebase.
In this case, rebasing is nice because our changes stay in a contiguous block at the top (vs merging which would interleave them), so it's easy for me and others to see exactly where our fork diverges.