3 ms·
I manage a maintained fork and periodically rebase our changes on top of upstream. In this case, rebasing is nice because our changes stay in a contiguous bloc
by languid-photic 9mo ago
I manage a maintained fork and periodically rebase our changes on top of upstream.
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.
- friedbeef 9mo agoDoesn’t that mean you have to fix all the merge conflicts introduced by your commits on every rebase though?
- skribanto 9mo agorerere can help, but OP probably has their own workflow
- chuckadams 9mo agoGit 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.
- deleted 9mo ago[deleted]
- froh 9mo agoif 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.
- cryptonector 9mo agoYou'd have merge conflicts whether you merge or rebase.