> Jujutsu, in contrast, is more like playing with Play-Doh. You take a lump, cut it into two, shape one piece into something, give it a name, change your mind, give it another name, take a bit of the second piece and stick it on the first piece, and generally go back and forth all around your play area, making changes.
I love this description and it describes how I work with git. When I’m doing things locally I’m constantly committing small wip commits. When I get something the way I like it I’ll interactive rebase/just back it all up, and then create the perfect little boxes. I guess I should try jujutsu since it sounds like it might be even more for me. Although if you can’t get to the perfect boxes at the end I don’t know if I’d like it.
That's how I feel like working with git locally using a combination of basic commands and gitup (https://gitup.co/), that may be why I couldn't really get the selling point of jj when I tried it a couple weeks ago.
The only part that piqued my interest is merges being always successful and conflicts just sitting in the tree, waiting patiently to be resolved... It's the next logical step after being able to commit without synchronizing when we all moved away from SVN.
> gitup (https://gitup.co/)
That looks actually nice, but it seams to require macOS.
I think you would love jj then. It is dead-simple to just move things around - branches/bookmarks, commits and even single lines of code within a diff.
jjui (https://github.com/idursun/jjui) makes it all that much easier too
I'll say that Jujutsu makes the way to get to the perfect boxes really friction-free.