Why use jj instead of Git with Claude?

Jujutsu (jj) offers a more powerful DAG-based mental model for AI agents, including stable Change IDs and an undoable operation log, while remaining fully Git-compatible.

What happens if Claude encounters a merge conflict in jj?

Jujutsu stores conflicts within the commit itself. This skill teaches Claude to treat conflict resolution as a standard file edit rather than a blocked state.

Does this skill support interactive jj commands?

No, the skill explicitly enforces non-interactive flags (avoiding -i) to prevent the AI agent from hanging in a terminal user interface (TUI).

How does the bookmark model work for multiple agents?

It uses a one-bookmark-per-feature approach, providing structural isolation so different agents can work on specific concerns without conflicting in the working copy.

Jujutsu (jj) VCS Guide

Name: Jujutsu (jj) VCS Guide
Author: plasticbeachllc

byplasticbeachllc

0•

Developer Tools

Enables AI agents to manage version control using Jujutsu (jj) with optimized command patterns and mental models.

The jj-guide skill provides a comprehensive operational framework for Claude to interact with Jujutsu (jj) repositories efficiently and safely. It enforces critical rules for AI-driven VCS management, such as avoiding interactive TUIs that cause hangs and using stable Change IDs instead of volatile commit hashes. By providing a direct Git-to-jj mapping and explaining the 'working copy as a commit' mental model, this skill ensures Claude can perform complex rebases, bookmark management, and conflict resolution within modern, Git-compatible Jujutsu environments.

Key Features

01Optimizes commit workflows using stable Change IDs and auto-tracking

02Provides a detailed Git-to-jj command reference for seamless transition

03Includes advanced revset quick-references for complex repository navigation

040 GitHub stars

05Enforces non-interactive jj command usage to prevent agent execution hangs

06Implements a structural multi-agent bookmark model for isolated feature development

Use Cases

01Performing version control tasks in repositories using the Jujutsu (.jj) directory structure

02Synchronizing and rebasing local changes with remote Git origins using jj's superior conflict handling

03Managing isolated feature development across multiple agent instances using bookmarks

Key Features

01Optimizes commit workflows using stable Change IDs and auto-tracking

02Provides a detailed Git-to-jj command reference for seamless transition

03Includes advanced revset quick-references for complex repository navigation

040 GitHub stars

05Enforces non-interactive jj command usage to prevent agent execution hangs

06Implements a structural multi-agent bookmark model for isolated feature development

Use Cases

01Performing version control tasks in repositories using the Jujutsu (.jj) directory structure

02Synchronizing and rebasing local changes with remote Git origins using jj's superior conflict handling

03Managing isolated feature development across multiple agent instances using bookmarks