Does this skill help with merge conflicts?

Yes. It explains the jj mental model where conflicts are stored directly in commits, allowing the AI to resolve them at a later time rather than being forced to resolve them during the merge operation.

How does this skill prevent the AI from hanging?

It enforces the use of -m flags for descriptions and prohibits interactive -i flags, ensuring that the AI never triggers an external text editor or TUI that would stall the session.

What is the benefit of using Change IDs over Commit IDs?

Change IDs in Jujutsu are stable across rewrites and rebases. This skill teaches the AI to prioritize Change IDs so that references remain valid even after the repository history is modified.

Can I use Git commands while this skill is active?

No. The jj-guide skill explicitly enforces the use of jj commands to prevent repository state issues, as Jujutsu manages the version control layer more efficiently than Git in these environments.

Jujutsu (jj) VCS Guide

Name: Jujutsu (jj) VCS Guide
Author: plasticbeachllc

byplasticbeachllc

0•

Developer Tools

Enables seamless Jujutsu version control operations by providing specialized command mappings and workflow guidance for AI agents.

This skill acts as a critical compatibility layer for developers using the Jujutsu (jj) version control system with Claude Code. It prevents the AI from falling back to Git-based habits that can corrupt or mismanage jj repositories. By enforcing non-interactive command flags and providing a structural mental model for change IDs and bookmarks, it ensures that Claude can safely perform commits, rebases, and multi-agent workflows without manual intervention or process hangs.

Key Features

01Multi-agent isolation model using named bookmarks and feature branching

02Non-interactive flag injection to prevent agent execution hangs

03Advanced Revset and Fileset guidance for complex repository navigation

040 GitHub stars

05Comprehensive Git-to-jj command reference for common VCS tasks

06Automatic enforcement of jj-exclusive commands in detected repositories

Use Cases

01Converting complex Git workflows into efficient Jujutsu commands automatically

02Managing isolated feature development across multiple AI agents using bookmarks

03Performing version control operations in repositories where the .jj/ directory is present

Key Features

01Multi-agent isolation model using named bookmarks and feature branching

02Non-interactive flag injection to prevent agent execution hangs

03Advanced Revset and Fileset guidance for complex repository navigation

040 GitHub stars

05Comprehensive Git-to-jj command reference for common VCS tasks

06Automatic enforcement of jj-exclusive commands in detected repositories

Use Cases

01Converting complex Git workflows into efficient Jujutsu commands automatically

02Managing isolated feature development across multiple AI agents using bookmarks

03Performing version control operations in repositories where the .jj/ directory is present