← Back to context

Comment by tcoff91

2 months ago

https://ofcr.se/jujutsu-merge-workflow

With `jjui` this strategy takes only a few keystrokes to do operations like adding/removing parents from merge commits.

It's so nice to have like 4 parallel PRs in flight and then rebase all of them and all the other experimental branches you have on top onto main in 1 command.

Also, I cannot even stress to you how much first-class-conflicts is a game changer. Like seriously you do NOT understand how much better it is to not have to resolve conflicts immediately when rebasing and being able to come back and resolve them whenever you want. It cannot be overstated how much better this is than git.

Also, anonymous branches are SOOOO much better than git stashes.

11 comments

tcoff91

Reply
1718627440  2 months ago

> Also, anonymous branches are SOOOO much better than git stashes.

You can do anonymous branches in Git as well. I use both for different use cases.

  • tcoff91  2 months ago

    The UX around anonymous branches in git is not nearly as good as jj though.

    Also git has no equivalent to the operation log. `jj undo` and `jj op restore` are so sweet.

    • 1718627440  2 months ago

      I can't comment on the UX of jj, but with git you literally just specify the commit, it doesn't feels tedious to me.

      > Also git has no equivalent to the operation log.

      For easy cases it's just git reset @{1}, but sure the oplog is a cool thing. I think it will be just added to git eventually, it can't be that hard.

      5 replies →