jj: keep bookmark advance off the megamerge
Assisted-by: Claude Opus 5 via Claude Code
diff --git a/.config/jj/config.toml b/.config/jj/config.toml
index 7446ead6..025c32ed 100644
--- a/.config/jj/config.toml
+++ b/.config/jj/config.toml
@@ -140,6 +140,9 @@ edit = true
# working copy. Left deliberately unambiguous: above a megamerge this resolves
# to every stack tip at once and jj refuses, which beats picking one by guess.
bookmark-advance-to = 'closest_pushable(@)'
+# Default, minus the megamerge bookmark, so advancing lands on the trunk-side
+# bookmark under it. Pattern form is empty when `mm` is gone; bare `mm` errors.
+bookmark-advance-from = 'heads(::to & bookmarks() & ~bookmarks(exact:"mm"))'
[revset-aliases]
'immutable_heads()' = 'builtin_immutable_heads() | heads(~mine())'