Can I use this for standard Git repositories?

This skill specifically targets the Jujutsu (jj) CLI. While JJ is often used as a front-end for Git, these commands are unique to the Jujutsu workflow.

Is it safe to abandon commits during a merge?

Yes, using the 'jj abandon' command as guided by this skill removes commits from your history without destroying the files in your current working copy.

What is Jujutsu (jj)?

Jujutsu is a Git-compatible version control system designed for speed, safety, and powerful history manipulation, using a unique model where all repositories share a common root.

How does this skill handle merge conflicts?

The skill provides strategic guidance on resolving conflicts that arise during the rebase process when combining repositories with overlapping files.

JJ Repo Merger

Name: JJ Repo Merger
Author: edmundmiller

byedmundmiller

•

Developer Tools

Streamlines the process of merging, rebasing, and consolidating separate Jujutsu (jj) repositories into a single unified history.

The JJ Repo Merger skill provides expert guidance for managing complex Jujutsu (jj) version control operations, such as combining unrelated repositories, recovering from diverged local and remote histories, and splicing commit chains. By leveraging the unique architectural property that all Jujutsu repositories share a common empty root, this skill helps developers navigate advanced rebasing scenarios and history cleanup with precise CLI commands and best practices. It is particularly useful for monorepo migrations and fixing desynchronized rewrite histories.

Key Features

01Procedures for rebasing entire commit chains onto new destinations

0242 GitHub stars

03Support for merging unrelated projects into a unified repository

04Strategies for recovering from diverged local and remote histories

05Step-by-step guidance for adding and fetching remote repositories in JJ

06Techniques for abandoning unwanted commit chains while preserving data

Use Cases

01Consolidating multiple standalone projects into a monorepo structure

02Syncing local work with remote history after significant upstream rewrites

03Migrating code and history from one Jujutsu environment to another

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add edmundmiller/dotfiles jj-merge-repos

For use in Claude.ai and ChatGPT

Download Skill