First class conflicts are way better than modal states. https://ofcr.se/jujutsu-merge-workflow/ https://ofcr.se/jujutsu-merge-workflow/ I literally will have

First class conflicts are way better than modal states. https://ofcr.se/jujutsu-merge-workflow/ https://ofcr.se/jujutsu-merge-workflow/ I literally will have like 4 PRs in flight at once and have an octopus merge of all my separate PRs that I can then work on top of. JJ can rebase all 4 separate branches, the octopus merge, and the work on top of the octopus merge in a single command: jj rebase -d main. If there are conflicts I can then resolve them whenever I want. You have no idea what you are talking about if you think git’s interactive rebase holds a candle to what jj rebase can do.