atproto Thingiverse but good
PM-7: document jj workspace merge-back workflow in AGENTS.md
+7
+7
AGENTS.md
+7
AGENTS.md
···
33
33
- Use ticket-derived names like `pm-12-short-summary`.
34
34
- Check your own changes with `jj diff` before reporting completion.
35
35
- Use `jj describe` only to update the description of an already-isolated change; do not use it as a substitute for `jj new` at task start.
36
+
- `main` marks the default workspace head — the trunk merged work lands on. Merge a workspace's change back into the default line by rebasing it onto `main`, then advancing `main` and the default head:
37
+
```sh
38
+
jj rebase -r <workspace>@ -d main # rebase the workspace change onto main
39
+
jj bookmark set main -r <workspace>@ # advance main to the merged change
40
+
jj new main -m "<ticket>: ..." # open the next change on top; this also updates the default workspace head
41
+
```
42
+
After an external rebase the workspace's working copy is stale — run `jj workspace update-stale` inside that workspace before editing there again. Put follow-up edits in a fresh change on top of `main`, not piled onto a merged workspace change.
36
43
37
44
## Commands
38
45