skills.rest
M4n5ter
M4n5terCOMMUNITY
Explore all skills by this author →
𝕏@M4n5terGitHub

jj-vcs

Coordinate JJ version-control workflows and Git interoperability with rollback safeguards.

3|Updated Dec 22, 2025
Search Tags:#conflict-resolution#workflows#jj#version-control#revsets#filesets#git-interoperability
One-click install
npx skills add https://github.com/M4n5ter/skills --skill jj-vcs
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: jj-vcs
Source: https://github.com/M4n5ter/skills/tree/main/jj-vcs
Command: npx skills add https://github.com/M4n5ter/skills --skill jj-vcs

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill guides users through JJ usage, workflows, revset/fileset syntax, Git interoperability, and configuration troubleshooting. It helps answer differences between jj commands and concepts, migrate Git workflows to JJ, and manage conflicts, rollbacks, and remote bookmarks.

Core Features & Use Cases

  • Workflow guidance: decision trees and best practices for common JJ workflows, conflict resolution, and Git interop.
  • Reference-driven learning: links to core workflows, revsets, and filesets with usage patterns and examples.
  • Safety & rollback guidance: procedures for safe changes, backups, and reversible operations.

Quick Start

Inspect the current workspace state with jj st and follow JJ workflows to initialize, resolve conflicts, and interoperate with Git.

Frequently Asked Questions about jj-vcs

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve conflicts when rebasing changes in a JJ repository?▼

To resolve conflicts during a JJ rebase, you can follow specific workflow decision trees to manage and minimize conflicts, then use jj op log and jj undo to safely rollback any problematic operations.

How does JJ interoperability work with an existing Git remote?▼

JJ Git interoperability allows you to sync bookmarks with Git remotes, enabling you to migrate existing Git workflows into JJ while maintaining remote synchronization and managing configuration troubleshooting.

What is the best way to safely undo a bad rebase or operation in JJ?▼

The best way to safely undo operations in JJ is by using the built-in safeguards like jj op log to inspect history and jj op restore or jj undo to reverse unwanted changes and restore a previous repository state.

How do I use revsets and filesets to select specific changes in JJ?▼

You can use revset and fileset syntax in JJ to query and select specific revisions or files, applying usage patterns and examples to target exactly the changes you need for your version-control workflow.

Can I initialize a new JJ repository in a project that already uses Git?▼

Yes, you can initialize a JJ repository in an existing Git project, leveraging Git interoperability features to coordinate workflows, sync bookmarks, and manage conflicts without abandoning your current Git setup.

Why do my bookmarks not sync correctly with the remote in JJ?▼

Bookmark sync issues in JJ often require configuration troubleshooting, but you can safely inspect the current workspace state with jj st and follow Git interop workflows to identify and resolve remote syncing conflicts.

Related Skills

Explore More Software Engineering Skills→
get-theo-aiget-theo-ai

theo-jujutsu

Automate jj version control workflows in colocated or Git-backed repositories.

Official
Advanced
nashgaonashgao
3

Git Push, Pull & Fetch Operations

Manage Git push, pull, and fetch operations with safety checks.

Community
Advanced
schpetschpet
5

jjwf

Guide Jujutsu (jj) workflow commands for status, diff, commit, and push operations.

Community
Intermediate
pagerguildpagerguild

jj-expert

Guide software teams through Jujutsu version control workflows, revsets, and Git interoperability.

Official
Advanced