Re:Jujutsu for Everyone
by 1718627440 on Monday September 01, 2025 @03:44AM
(#45090471)
I would just abort the conflict resolution.
[ Parent
| on HN ]
Re:Jujutsu for Everyone
by steveklabnik on Monday September 01, 2025 @05:14PM
(#45096669)
Then you’re back to the state before the rebase. Which is fine, the point is just that they’re not equivalent!
Re:Jujutsu for Everyone
by 1718627440 on Tuesday September 02, 2025 @01:23PM
(#45106167)
Yes. 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.