How are conflicts handled differently in this skill?

Jujutsu allows operations to succeed even with conflicts; this skill provides the commands to resolve those conflicts interactively or via specific 'ours/theirs' tools after the fact.

What are immutable commits in Jujutsu?

Immutable commits are protected from being rewritten, typically including the main branch or tags. This skill helps you configure and identify these protected states to prevent accidental data loss.

How does jj-safety help with repository recovery?

It provides specific patterns for using the Jujutsu operation log to identify previous stable states and commands to restore the entire repository to those specific operation IDs.

Can I undo multiple operations at once?

Yes, the skill demonstrates how to chain undo commands or use the operation log to jump back to a state several steps prior.

Jujutsu Safety & Recovery

Name: Jujutsu Safety & Recovery
Author: LITl-l

byLITl-l

0•

开发者工具

Manages Jujutsu version control safety operations including undo, redo, state restoration, and conflict resolution.

The jj-safety skill empowers developers using the Jujutsu (jj) version control system to work with total confidence by leveraging its robust safety architecture. It provides specialized guidance for navigating the operation log, reversing accidental changes through undo/redo commands, and recovering lost work from abandoned commits or failed rebases. Whether you need to resolve complex merge conflicts or restore your entire repository to a previous state using unique operation IDs, this skill ensures your development workflow remains resilient and reversible.

主要功能

01Management of immutable commits and workspace safety

02Comprehensive undo and redo capabilities for all repository actions

03Interactive and automated conflict resolution patterns

04Detailed operation log inspection and diffing between repo states

05Advanced repository restoration to specific operation IDs

060 GitHub stars

使用场景

01Auditing repository changes using the operation log to find specific state transitions

02Recovering work after an accidental commit abandonment or bad rebase

03Resolving multi-way merge conflicts using Jujutsu's unique conflict markers

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add litl-l/dotfiles jj-safety

For use in Claude.ai and ChatGPT

Download Skill