Skills
.Work. You
Rest

fix-jj-conflicts

Official

Resolve merge conflicts in Jujutsu repositories efficiently.

Software Engineering#version control#merge conflicts#repository management#conflict resolution#Jujutsu
AuthorFirma-AI
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps users quickly and effectively resolve merge conflicts in Jujutsu repositories, reducing the time spent on manual conflict resolution.

Core Features & Use Cases

  • Conflict Resolution: Automates the process of identifying and resolving merge conflicts in Jujutsu repositories.
  • Automated Verification: Ensures that conflicts are resolved correctly by automatically verifying the repository state after each fix.
  • Branch and Revision Specific: Allows resolution of conflicts based on specific branches or revisions.
  • User Confirmation: Provides a user-friendly interface for squashing fixed changes into their parents if desired.

Quick Start

To resolve merge conflicts starting from the oldest, use the command: fix-jj-conflicts -b @

Dependency Matrix

Required Modules

None required

Components

scripts

💻 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: fix-jj-conflicts
Download link: https://github.com/Firma-AI/openfirma/archive/main.zip#fix-jj-conflicts

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

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 620,000+ vetted skills library on demand.