jj-merge-repos
Merging JJ Repositories
Guide for merging two separate Jujutsu repositories into a single unified repo.
When to Use This Skill
- Combining two unrelated repositories into one
- Recovering from diverged histories (local vs remote rewrites)
- Splicing commit histories together
- Rebasing an entire repository onto another
How It Works
All JJ repos share a common empty root commit. When you add a remote from another repo and fetch, you get two diverging chains from that root. You can then:
- Delete one chain (if you just want the other repo's history)
- Rebase one chain onto the other (splice them together)
Quick Reference
More from edmundmiller/dotfiles
jj-history-investigation
Investigate jj commit history, split commits, annotate file changes, and clean up redundant commits. Use when debugging history, splitting large commits, or rewriting shared history.
53tmux-status-debug
Debug and test tmux pane status detection for AI agents (opencode, claude, amp). Use when patterns aren't matching, status icons are wrong, or adding new detection patterns.
50using-jj-workspaces
Set up isolated jj workspaces for parallel development. Use when creating new workspaces, organizing workspace directories, or setting up gitignore for workspaces.
48agenix-secrets
>
46hass-config-flow
>
45nix-rebuild
>
45