jj-megamerge

Installation
SKILL.md

jj Megamerge Workflow

A megamerge is a local-only octopus merge that combines all the user's active feature branches into one integrated working state. The user works in an empty WIP commit above the megamerge, then routes hunks back to individual branches with jj absorb. Only the individual branches are pushed — never the megamerge itself.

Reference: https://isaaccorbrey.com/notes/jujutsu-megamerges-for-fun-and-profit

Detect that a megamerge is in play

Run before any non-trivial jj operation:

jj log -r 'closest_merge(@)' --no-graph -T 'description ++ "\n"'

If the description is megamerge (or output is non-empty and the merge is mutable), you are in the megamerge workflow. Other tells:

  • jj log shows a commit labeled megamerge with 3+ parents
  • @ is empty with description (no description set) and parent is the megamerge
  • closest_pushable(@) resolves to the megamerge itself (suspicious — verify before pushing)
Installs
1
GitHub Stars
18
First Seen
6 days ago
jj-megamerge — laulauland/dotfiles