You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: src/advanced/simultaneous-edits.md
+13Lines changed: 13 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -158,6 +158,19 @@ Whew! What a change! Five parents. Let's create an extra one so we can use our
158
158
squash-style workflow more easily: we temporarily work on a `@` change, and then
159
159
`jj squash` diffs back into whichever parent makes the most sense.
160
160
161
+
> **Tip: `jj absorb` — redistribute edits back into the right branches.**
162
+
> When your working copy (`@`) contains edits that belong to multiple PRs, `jj absorb` will push those edits into the nearest mutable ancestors instead of you manually splitting and rebase-ing.
163
+
> Example:
164
+
>
165
+
> ```sh
166
+
> jj absorb # absorb from @ into appropriate mutable parents
> Use it after developing across several branches in one working copy — it saves the cut-and-paste + rebase chore by automatically redistributing changes where they belong.
173
+
161
174
```console
162
175
> jj new
163
176
Working copy now at: nllzosqm 85324040 (empty) (no description set)
0 commit comments