What problem does it solve? Teams using Jujutsu (jj) instead of raw Git often struggle with its unique model where the working copy is always a change, bookmarks replace branches, and conflicts are recorded as first-class commit states. This Skill standardizes the entire jj workflow for the KHI project so contributors avoid common mistakes like squashing review fixes or inventing manual branch names. ## Core Features & Use Cases - Change Management: Enforces correct use of jj new, jj describe, and jj status with clear task boundaries and workspace isolation rules. - PR Review Handling: Prescribes an incremental commit workflow (no squashing) with bookmark advancement so reviewers can inspect per-round diffs. - Conflict Resolution: Defines an oldest-to-newest conflict resolution procedure using jj log -r 'conflicts()', jj new, and jj squash. - Use Case: A contributor receives PR review feedback on a jj-managed change. The Skill directs them to create a new child revision on the PR commit, apply fixes, run make test-go and make test-web, move the bookmark with jj bookmark move, and push—preserving full review history. ## Quick Start Ask the assistant to follow the jj workflow to create a new change, address PR review feedback without squashing, or resolve conflicts from oldest to newest commit.
