jj-vcs-workflow

Jujutsu (jj) VCS の総合ガイド。基本コマンド・Git移行・並列開発・履歴操作・PRレビュー・安全な push ワークフローをカバー。以下の場合に使用: (1) jj コマンドの使い方を確認したいとき (2) Git から jj への移行時 (3) 並列開発・履歴書き換え・コンフリクト解消を行うとき (4) PR レビュー対応時 (5) push を実行したいとき

16 stars

Best use case

jj-vcs-workflow is best used when you need a repeatable AI agent workflow instead of a one-off prompt.

Jujutsu (jj) VCS の総合ガイド。基本コマンド・Git移行・並列開発・履歴操作・PRレビュー・安全な push ワークフローをカバー。以下の場合に使用: (1) jj コマンドの使い方を確認したいとき (2) Git から jj への移行時 (3) 並列開発・履歴書き換え・コンフリクト解消を行うとき (4) PR レビュー対応時 (5) push を実行したいとき

Teams using jj-vcs-workflow should expect a more consistent output, faster repeated execution, less prompt rewriting.

When to use this skill

  • You want a reusable workflow that can be run more than once with consistent structure.

When not to use this skill

  • You only need a quick one-off answer and do not need a reusable workflow.
  • You cannot install or maintain the underlying files, dependencies, or repository context.

Installation

Claude Code / Cursor / Codex

$curl -o ~/.claude/skills/jj-vcs-workflow/SKILL.md --create-dirs "https://raw.githubusercontent.com/diegosouzapw/awesome-omni-skill/main/skills/tools/jj-vcs-workflow/SKILL.md"

Manual Installation

  1. Download SKILL.md from GitHub
  2. Place it in .claude/skills/jj-vcs-workflow/SKILL.md inside your project
  3. Restart your AI agent — it will auto-discover the skill

How jj-vcs-workflow Compares

Feature / Agentjj-vcs-workflowStandard Approach
Platform SupportNot specifiedLimited / Varies
Context Awareness High Baseline
Installation ComplexityUnknownN/A

Frequently Asked Questions

What does this skill do?

Jujutsu (jj) VCS の総合ガイド。基本コマンド・Git移行・並列開発・履歴操作・PRレビュー・安全な push ワークフローをカバー。以下の場合に使用: (1) jj コマンドの使い方を確認したいとき (2) Git から jj への移行時 (3) 並列開発・履歴書き換え・コンフリクト解消を行うとき (4) PR レビュー対応時 (5) push を実行したいとき

Where can I find the source code?

You can find the source code on GitHub using the link provided at the top of the page.

SKILL.md Source

# Jujutsu (jj) VCS Workflow

Jujutsu (jj) を使った開発のための総合ガイド。基本操作から高度なワークフローまでをカバーする。

## 基本概念

- **Change**: jj の作業単位。Git の「コミット」に相当するが、常に編集可能
- **Working Copy (@)**: 現在編集中の Change。自動的にスナップショットされる(`git add` 不要)
- **Bookmark**: Git のブランチに相当。主にリモートとの同期ポイントとして使用
- **Operation Log**: すべての操作履歴を追跡。`jj undo` で取り消し可能

## クイックリファレンス

| 操作 | コマンド |
|-----|---------|
| 状態確認 | `jj status` / `jj st` |
| 差分表示 | `jj diff` |
| 履歴表示 | `jj log` |
| コミット | `jj commit -m "メッセージ"` |
| 説明編集 | `jj describe -m "メッセージ"` |
| 新規 Change | `jj new` |
| 取り消し | `jj undo` |
| リモート取得 | `jj git fetch` |

## push は必ず safe-push 経由で行う

`jj git push` の直接実行は禁止されている。push は必ず以下のワークフローで行う:

1. `jj git fetch` でリモートの最新状態を取得
2. `jj bookmark list --conflicted` で diverge を確認
3. `jj git push --dry-run` で push 内容を確認(hook で強制)
4. ユーザー確認後に `jj git push` を実行

hook とシェルガードにより、dry-run を経由しない push は自動的にブロックされる。
詳細は [safe-push.md](./guides/safe-push.md) を参照。

## 詳細ドキュメント

### 基本操作

- **[commands.md](./commands.md)**: 主要コマンドの詳細な使い方とオプション
- **[git-to-jj.md](./git-to-jj.md)**: Git コマンドと jj コマンドの対応表
- **[revisions.md](./revisions.md)**: リビジョン指定方法(@, @-, revset 式)

### ワークフロー

- **[workflows.md](./workflows.md)**: 新規機能開発・不具合修正のワークフロー
- **[best-practices.md](./best-practices.md)**: ベストプラクティスとトラブルシューティング

### 高度な操作

- **[guides/parallel-work.md](./guides/parallel-work.md)**: 並列開発ワークフロー(`jj new` / `jj edit`)
- **[guides/workspace.md](./guides/workspace.md)**: Workspace を使った並列開発(ファイルシステム分離)
- **[guides/history-maintenance.md](./guides/history-maintenance.md)**: 履歴の書き換え(squash, split, rebase)
- **[guides/conflict-collab.md](./guides/conflict-collab.md)**: コンフリクト解消と Git 連携
- **[guides/pr-review-workflow.md](./guides/pr-review-workflow.md)**: Bookmark を活用した PR レビュー対応
- **[guides/safe-push.md](./guides/safe-push.md)**: 安全な push ワークフローと hook 設定

## 参考リンク

- 公式ドキュメント: https://www.jj-vcs.dev/
- CLI リファレンス: https://www.jj-vcs.dev/latest/cli-reference/
- Git コマンド対応表: https://www.jj-vcs.dev/latest/git-command-table/

Related Skills

jj-workflow

16
from diegosouzapw/awesome-omni-skill

Jujutsu atomic workflow with full operational reference for jj-based repositories.

@gw-git-worktree-workflows

16
from diegosouzapw/awesome-omni-skill

Master Git worktrees and gw-tools workflows for parallel development. Use this skill when creating worktrees, managing multiple branches simultaneously, navigating between worktrees, troubleshooting worktree issues, or setting up feature branch workflows. Triggers on tasks involving git worktree commands, branch isolation, parallel development, or gw CLI usage.

github-workflows

16
from diegosouzapw/awesome-omni-skill

Initialize or update GitHub Actions workflows for Go projects with comprehensive CI/CD pipelines including linting, testing, coverage, snapshot builds, and releases. Use when setting up GitHub Actions automation for Go projects. Trigger with "setup github actions", "add github workflows", or "configure ci/cd".

Gitee Workflow Automation

16
from diegosouzapw/awesome-omni-skill

深度集成 Gitee MCP,实现 Issue 管理、PR 自动化提交、代码审查和版本发布的全流程自动化。

git-workflow

16
from diegosouzapw/awesome-omni-skill

Git workflow guidance for commits, branches, and pull requests

git-workflow-automation

16
from diegosouzapw/awesome-omni-skill

Comprehensive Git workflow automation including branching strategies, pull request creation, code reviews, merge strategies, and release management. Use when Claude needs to help with Git operations, branching models (Git Flow, GitHub Flow), pull request creation, code reviews, merge conflicts, or release processes.

builder-workflow

16
from diegosouzapw/awesome-omni-skill

Phase-level implementation workflow for builder agents. Handles loading project rules, reading phase files, finding references, invoking domain skills, implementing all steps, and running verification (tests + typecheck). Invoke this skill as your first action — not user-invocable.

aero-workflow-automation

16
from diegosouzapw/awesome-omni-skill

Automate Aero Workflow tasks via Rube MCP (Composio). Always search tools first for current schemas.

add-workflow

16
from diegosouzapw/awesome-omni-skill

Guide for adding a new RolloutWorkflow to AReaL. Use when user wants to create a new workflow.

act-workflow-syntax

16
from diegosouzapw/awesome-omni-skill

Use when creating or modifying GitHub Actions workflow files. Provides guidance on workflow syntax, triggers, jobs, steps, and expressions for creating valid GitHub Actions workflows that can be tested locally with act.

1k-git-workflow

16
from diegosouzapw/awesome-omni-skill

Git workflow and conventions for OneKey development. Use when creating branches, committing code, or creating PRs. Triggers on git, branch, commit, PR, pull request, merge, workflow.

testing-workflow

16
from diegosouzapw/awesome-omni-skill

Meta-skill that orchestrates comprehensive testing across a project by coordinating testing-patterns, e2e-testing, and testing agents. Use when setting up testing for a new project, improving coverage for an existing project, establishing a testing strategy, or verifying quality before a release.