What is Jujutsu (jj)?

Jujutsu is a Git-compatible version control system that focuses on ease of use, safety, and powerful history rewriting capabilities.

How does this skill handle merge conflicts?

The skill provides the necessary commands to initiate a rebase or merge; if conflicts occur during the process, you resolve them using standard Jujutsu conflict resolution tools.

Can I use this to combine two completely different projects?

Yes. Because all Jujutsu repositories share a common empty root commit, you can add any repository as a remote and rebase its history onto your current project.

Is it possible to undo a repository merge if I make a mistake?

Yes, one of the primary benefits of Jujutsu is its operation log, which allows you to use 'jj undo' to revert almost any action, including complex rebases.

Jujutsu Repository Merger

Name: Jujutsu Repository Merger
Author: edmundmiller

byedmundmiller

•

Developer Tools

Orchestrates the merging and synchronization of disparate Jujutsu (jj) repositories into a single, unified version history.

About

The jj-merge-repos skill provides a structured workflow for combining separate Jujutsu repositories, recovering from diverged local/remote histories, or splicing commit chains together. By leveraging Jujutsu's unique architecture where all repositories share a common empty root, this skill simplifies complex version control operations such as rebasing entire repository histories and cleaning up unwanted branches. It is particularly useful for developers managing advanced dotfiles, consolidating projects into monorepos, or fixing synchronization issues between rewritten remote histories and local work.

Key Features

Recovers diverged histories between local and remote rewrites
40 GitHub stars
Splices entire commit chains from one repo onto another
Combines unrelated repositories into a single unified history
Provides automated rebase and abandon commands for history cleanup
Streamlines remote management and fetching for Jujutsu workflows

Use Cases

Combining two legacy projects into a single unified monorepo
Migrating specific project history into a centralized dotfiles repository
Syncing local changes after a remote force-push or history rewrite

About

Key Features

Recovers diverged histories between local and remote rewrites
40 GitHub stars
Splices entire commit chains from one repo onto another
Combines unrelated repositories into a single unified history
Provides automated rebase and abandon commands for history cleanup
Streamlines remote management and fetching for Jujutsu workflows

Use Cases

Combining two legacy projects into a single unified monorepo
Migrating specific project history into a centralized dotfiles repository
Syncing local changes after a remote force-push or history rewrite