Simultaneous edits flow can be simplified with `--after`/`-A`

[algmyr]

The act of moving a change from the tip to one of the branches can be done more easily since --after/-A was added. The probably cleanest flow is to be outside the commit you're moving (e.g. do a new) and then jj rebase -r thing_to_move -A the_target.

jj new and jj rebase -r @- -A target might fit the existing example well.

[salty-horse]

Even simpler:

jj new -A z -m "second 80% done"

Perhaps it's still useful to show the example with the multiple-revision rebase, but as an alternative, and not the recommended way to solve this specific problem.

[algmyr]

Right, looking at the example in question

jj new -A z -m "second 80% done" --no-edit

is what you would want. And yeah, having an example of "rebase the thing on top of the megamerge into place" would be very nice demonstration of the workflow in action.

The tutorial itself was written before we had nice things like -A/-B for rebase (and new), when the flow for doing megamerges was a lot less ergonomic