Restores and synchronizes broken Jujutsu (jj) and Super Pull Request (SPR) development stacks.
This skill automates the recovery of jj+SPR stacks that have fallen into a broken or inconsistent state. It is specifically designed to handle common issues like manual GitHub web merges, out-of-order PR landings, and 'ghost' changes where content exists in the trunk but remains as an empty commit in the local graph. By performing a multi-step diagnosis and cleanup—including closing orphaned PRs, stripping stale metadata, and rebasing the stack—it ensures your local development environment perfectly mirrors the remote repository state.
Key Features
010 GitHub stars
02Comprehensive stack diagnosis and PR mapping
03Safe closing of orphaned or stale synthetic base PRs
04Bulk stripping of stale Pull Request URLs from commit messages
05Guided rebase and recreation of the SPR stack
06Automated identification and removal of 'ghost' changes
Use Cases
01Repairing PRs that show incorrect diffs due to stale parent PRs or synthetic bases
02Fixing a stack after a colleague merges a PR via the GitHub UI instead of using jj spr land
03Cleaning up a local graph containing empty changes after a trunk rebase
