You're building a feature in three layers: database schema → API endpoints → UI. Each is its own PR. PR 1 gets review feedback while you're already building PR 3. In Git this is a nightmare of rebases and force pushes. In jj you fix PR 1 and the whole stack silently updates.
See your stack: jj log
You have three stacked changes: 'Add DB schema' → 'Add API' → 'Add UI'. PR 1 (wstk01, 'Add DB schema') just got review feedback — the table name is wrong. It should be user_sessions, not sessions.
● See your stack: `jj log`
○ Jump into PR 1: `jj edit wstk01`
○ Apply the fix: `echo "CREATE TABLE user_sessions (id INT);" > db/schema.sql`
○ Jump back to the top: `jj edit wstk03`
○ Verify: `jj log`
○ Move PR 2 to root: `jj rebase -s wstk02 -d root()`
○ Restore the stack: `jj undo`
🧩 The Merge MinefieldUnsolved
📖 Story
Your teammate refactored the entire API layer while you were building the frontend. You both touched the same three files.
You rebased your work on top of theirs and got three conflicts. Your team has decided to go with your teammate's version for now — no need to manually merge the files.
Your job is simpler: identify all three conflicted files and run jj resolve on each one. The file content will be taken care of separately.
Note: the file content isn't important for this problem — just clear the conflict flags.
Goal
jj log -r 'all()' must:
jj Terminal
🧩 Problem: The Merge Minefield
Three files are in conflict after a rebase. Clear the conflict flags and get back to a clean state.
Use the terminal to solve the problem. jj log -r 'all()' will be checked automatically.
