If you haven't tried it yet, I definitely recommend checking Jujutsu Version Control System.
I literally heard about it two days ago, started reading through some tutorials, and already feel like this is something exciting and new in the VCS world. You can use it locally on any git repository you already have, since it uses git as the backend.
Anyone else in the team can keep on using git, and if you feel like it you can switch back to use git at any time.
`jj` feels intuitive, and makes rebasing less of a hassle; actually there is no hassle! How many times have you done `git rebase --abort`, when you're halfway through fixing the conflicts using git rebase? I have quite many times. I hate it.
With jj it's no problem, it won't stop you to fix your conflicts, but lets you continue your work, and fix the conflicts later. And when you do that, it automatically rebases the fix to the child changes. It also lets you do any changes anywhere in the history. If you feel like some change is better to be done in another commit, you can just insert the commit after/before another, and squash the changes. Then continue working as usual.
This is yet another rabbit-hole for me, and I love it! Of course, I still need to use it in my day-to-day work, and I'll probably be going back to the tutorials, and asking stupid questions, but I have a feeling it'll be all right.
Here's a couple of resources I've been reading through:
https://steveklabnik.github.io/jujutsu-tutorial/
https://zerowidth.com/2025/what-ive-learned-from-jj/
#JujutsuVCS #jj #git #vcs #programming #programminglife