The Wrong Base

📁 Files

src/index.ts

src/user.ts

src/userController.tsA

src/userService.ts

A NewM Modified

JJ Log

◆ zzzzzzzz Learner 2026-06-17 08:35:17 00000000 root()

○ wbase01 Learner 2026-06-17 08:35:22 base1111

│ Initial app

○ wfeat01 Learner 2026-06-17 08:35:42 feat1111

│ Add user model

○ wfeat02 Learner 2026-06-17 08:35:52 feat2222

│ Add user service

@ wfeat03 Learner 2026-06-17 08:36:07 feat3333

│ Add user controller

JJ Graph@ wfeat03

📍 Wrong Place0/4

📖 Story

You were working on a feature and — oops — you made your changes directly on main. In Git you'd need git reset, git stash, git checkout -b, git stash pop. In jj, you just bookmark your work and move main back.

Check the log: jj log

Your working copy (@) has the "Add payment integration" change, but it should be on a feature bookmark, not on main. The change "last good main" (wplce01) is where main should be.

● Check the log: `jj log`

○ Create a bookmark where your work is: `jj bookmark create feature/payments`

○ Move @ back to where main should be: `jj new wplce01`

○ Move the main bookmark: `jj bookmark move main`

🧩 The Wrong BaseUnsolved

📖 Story

You built a three-change feature stack last week. Problem: you branched off an old version of main. The real main has moved forward with two new commits from your teammates. Your stack needs to sit on top of the latest main before you can open a PR. Rebase your entire feature stack onto the tip of main, then verify the files look right.

Goal

jj log -r 'all()' must:

contain "Add user controller"
contain "teammate: Add logger"

jj Terminal

🧩 Problem: The Wrong Base

Your feature stack was built on a stale branch. Rebase the whole thing onto the latest main without losing any work.

Use the terminal to solve the problem. jj log -r 'all()' will be checked automatically.