📁 Files
src/cart.tsM
A NewM Modified
JJ Log
◆ zzzzzzzz Learner 2026-06-17 08:35:45 26114fbb root()
○ wconf01 Learner 2026-06-17 08:35:50 3178efd1
│ Initial app
@ wconf03 Learner 2026-06-17 08:36:00 0c7ae74f
│ Add cart UI
JJ Graph@ wconf03
GitorJujutsu
⚔️ The Teammate Conflict0/5
📖 Story
You've been building a cart UI for two days. Your teammate pushed a refactor of the same file. In Git, this means git fetch, git rebase, resolve conflicts, git rebase --continue, git push. In jj, commit 1 of 3 conflicts, and the other 2 just rebase cleanly above it — and you can keep working on other things while the conflict waits.
See the situation:
jj logYour work is in 'Add cart UI' (change ID starts with wconf03). Meanwhile, someone refactored the same file on main — that's 'main refactor' (wconf02). They changed the same lines. A conflict is coming.
● See the situation: `jj log`
○ Rebase your work onto the updated main: `jj rebase -s wconf03 -d wconf02`
○ Don't panic — check status: `jj status`
○ Edit `src/cart.ts` — keep both `render()` and the fixed `total()`, drop the markers — then run `jj resolve src/cart.ts`
○ Verify: `jj log`
jj Terminal
📘 Starting tutorial: The Teammate Conflict
Your teammate pushed changes while you were working. Rebase without fear — conflicts are just another state in jj.
Step 1: See the situation: `jj log`