3 ms·
To expand on this(since I asked the question), I see mostly downside as the branch with G is unusable until the conflicts are resolved. Being able to keep a mer
by adastra22 1y ago
To expand on this(since I asked the question), I see mostly downside as the branch with G is unusable until the conflicts are resolved. Being able to keep a merge halfway resolved is a nice CLI shortcut. There should be a stash command for this, and I expect there probably is, or it can be done with work trees.
- baq 1y agoThe branch is indeed unusable, as opposed to the whole repository being unusable - it's a very nice upside actually.
- yencabulator 1y agoMaking a local worktree/shallow clone is dirt cheap, if you're worried about `git rebase` not storing its state in a restartable fashion. jj's handling of merge conflicts is pretty much like in Git committing the conflict markers in git and editing the commit message to say "conflicting".