Loading Blog Article...
Loading Blog Article...
Loading Blog Article...
If you’ve been using Git for years, you’ve probably experienced moments like these:
git rebase -i HEAD~5 # conflict… panic
git reset --hard HEAD~3 # oops, wrong commit
git stash
git checkout feature
git stash pop # conflict again? Git is powerful, but it’s also easy to make mistakes and hard to recover.
Recently, I started using Jujutsu (jj) seriously—and it feels like version control finally stopped fighting me.
Jujutsu (jj) is a next-generation version control system developed by Google engineers.
Its goal sounds contradictory at first:
100% compatible with Git, but safer and easier to use
In practice, it delivers exactly that.
The philosophy of jj can be summarized in one sentence:
Make mistakes cheap, reversible, and non-fatal
jj rethinks several fundamental Git workflows—and the result is surprisingly refreshing.
In jj, almost every operation can be undone:
jj undoThere’s even a full operation log:
jj op log
jj op restore <operation-id>This means:
👉 You always have a way back.
The traditional Git workflow:
vim file.txt
git add file.txt
git commit -m "update"With jj:
vim file.txt
jj describe -m "update"Key differences:
It feels strange at first—but quickly becomes natural.
In Git:
git rebase main
# conflict → process stops → must resolve nowIn jj:
jj rebase -d main
# rebase succeeds, conflicts are recordedConflicts become state, not blockers:
👉 This is perfect for multitasking and AI-assisted development.
In jj, you don’t need to create branches upfront:
jj new -m "Implement new feature"When you’re ready to share:
jj bookmark create -r @ feature-x(Yes—jj uses bookmarks instead of branches.)
This workflow is ideal for:
This is where jj really shines.
You can use jj inside an existing Git repository:
git clone repo
cd repo
jj git init --colocateResult:
👉 jj is a personal upgrade that doesn’t disrupt your team.
jj’s parallel model works extremely well with AI tools:
# Human works on frontend
jj new -m "UI development"
# AI works on backend
jj new -m "API implementation"
claude-code "Implement REST API"
# Merge everything later
jj new @- @-- -m "Integration test"No stash.
No fear of conflicts.
No broken history.
This is where jj really feels like a tool designed for modern development.
I strongly recommend jj if you:
# Install (macOS)
brew install jj
# Try it in an existing Git repo
jj git init --colocate
# Common commands
jj new
jj describe
jj log
jj diff
jj undoJujutsu isn’t trying to replace Git.
Instead, it answers a better question:
What if version control didn’t punish mistakes?
If Git has ever slowed you down—or scared you—jj is absolutely worth trying.
Next step:
Try jj on a small personal project.
There’s a good chance you won’t want to go back.
Happy hacking 🚀
Back