3 ms·
Git won’t let the portion of the branch that’s still conflicted remain in conflict while you go and work on the other part.
by steveklabnik 1y ago
Git won’t let the portion of the branch that’s still conflicted remain in conflict while you go and work on the other part.
- 1718627440 1y agoI would just abort the conflict resolution.
- steveklabnik 1y agoThen you’re back to the state before the rebase. Which is fine, the point is just that they’re not equivalent!
- 1718627440 1y agoYes. What's the equivalent would be to just keep the successfully rebased part. Right now you need to do keep the ref yourself. > Sounds like something that could also become a flag for git merge.