skills.rest
Firma-AI
Firma-AIOFFICIAL
Explore all skills by this author →
GitHub

fix-jj-conflicts

Resolves merge conflicts in Jujutsu repositories with automated verification.

106|5|Updated Mar 22, 2026
Search Tags:#version control#merge conflicts#repository management#conflict resolution#Jujutsu
One-click install
npx skills add https://github.com/Firma-AI/openfirma --skill fix-jj-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: fix-jj-conflicts
Source: https://github.com/Firma-AI/openfirma/tree/main/.skills/fix-jj-conflicts
Command: npx skills add https://github.com/Firma-AI/openfirma --skill fix-jj-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

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 @

Frequently Asked Questions about fix-jj-conflicts

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

FAQPage Schema
How do I resolve merge conflicts in a Jujutsu repository efficiently?▼

To resolve merge conflicts in a Jujutsu repository, you can use a step-by-step guide that identifies and fixes conflicts from the oldest to the newest. This process automates conflict resolution and verifies the repository state after each fix.

Can I resolve conflicts for a specific branch or revision in Jujutsu?▼

Yes, you can resolve conflicts for a specific branch or revision in Jujutsu. By targeting specific revisions, the tool focuses only on the conflicts within that scope, ensuring accurate resolution and automated verification of the repository state.

What is the best way to start fixing conflicts from the oldest revision in Jujutsu?▼

The best way to start fixing conflicts from the oldest revision in Jujutsu is to run the command `fix-jj-conflicts -b @`. This initiates the process, providing a step-by-step guide to resolve and verify conflicts efficiently.

Does the Jujutsu conflict resolution process verify repository state automatically?▼

Yes, the Jujutsu conflict resolution process includes automated verification. It automatically verifies the repository state after each fix to ensure that conflicts are resolved correctly before moving to the next revision.

How do I squash fixed changes into their parent revisions after resolving conflicts?▼

To squash fixed changes into their parent revisions after resolving conflicts, the tool provides a user-friendly interface for confirmation. This allows you to seamlessly integrate the resolved changes back into their parent revisions if desired.

Related Skills

Explore More Software Engineering Skills→
LuminairPrimeLuminairPrime

pull

Synchronize a local branch with origin/main and resolve merge conflicts.

Community
Intermediate
sanfordzhangsanfordzhang
1

openspec-bulk-archive-change

Batch-archive completed openspec changes with conflict-aware delta-spec handling.

Community
Advanced
pagerguildpagerguild

jj-expert

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

Official
Advanced
gujiachun-rainbowgujiachun-rainbow
8

Pulling Updates from Skills Repository

Sync local skills repository with upstream changes while preserving local modifications.

Community
Intermediate