Skills
.Work. You
Rest

jj-conflicts

Community

Identify and resolve conflicts in jj repositories.

Software Engineering#restore#merge#resolve#divergent#jj conflicts
Authoredmundmiller
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps you identify unresolved conflicts in jj, choose safe resolution paths, and use path-scoped restorations to preserve work.

Core Features & Use Cases

  • Conflict identification: Find commits with conflicts using jj log and status.
  • Resolution strategies: Use jj resolve for most cases or jj restore with --from for safe, path-specific restorations.
  • Safety-first workflows: Learn to squash or revert in a controlled manner to maintain history integrity.

Quick Start

When a conflict appears after a merge, inspect with jj diff, then choose a resolution path with jj resolve or jj restore for specific paths.

Dependency Matrix

Required Modules

None required

Components

references

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: jj-conflicts
Download link: https://github.com/edmundmiller/dotfiles/archive/main.zip#jj-conflicts

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository