3 ms·
> why not do “control rebases” immediately, instead of control merges? In this context the “control” in “control merge” is referring to not checking in the res
by dahart 7y ago
> why not do “control rebases” immediately, instead of control merges?
In this context the “control” in “control merge” is referring to not checking in the result. So if you don’t push the rebase, it would probably have exactly the same effect as a control merge... you’d save the conflict resolutions in the rerere database for later.
If you’re going to push the merge/rebase, then it depends on whether you’re working with other people in your branch. If you are, especially if it’s more than a few people, rebasing could inflict serious merge conflicts on everyone with any pending un-pushed changes. Rebase should be avoided in this case.