veykril/jj

Jujutsu is a version control system, a tool that helps you track changes to your code over time, and it's designed to be both easier to use and more powerful than what most people reach for today. The command you actually type is jj. The key selling point is that it works with existing Git repositories, so you can start using it on projects that already use Git without breaking anything or locking yourself in. The big idea is that your working copy of files is always automatically being saved as a commit. You never have to manually stage files or stash changes away before switching tasks. If you're halfway through editing a file and need to look at something else, you just do it, the tool snapshots your work behind the scenes. There's also an operation log that records everything you do, so if you make a mistake, you can undo it. Conflicts get treated as first-class objects stored inside commits, which means operations don't fail mid-way when two changes collide. You resolve them on your own time, and the resolution propagates automatically to related commits. This is built for developers who find Git's workflow clumsy but need to stay compatible with the Git ecosystem, GitHub, GitLab, existing team repos, and so on. A solo developer who keeps losing work to stash mistakes, or a team lead helping a junior coworker figure out what went wrong, would benefit from the operation log and automatic conflict handling. The README notes that all core developers use it daily on the project itself, and it's being actively developed with ties to Google's internal version control design. The tradeoff is that it's still pre-1.0. Some features like blame aren't there yet, there are performance issues, and the on-disk format may change before a stable release. It's a bet that a cleaner mental model is worth some early-stage rough edges.