What makes this different from standard Git merge tools?

This skill focuses on 'reading comprehension' rather than just 'surgery.' It requires mapping out exactly what both sides changed and why before allowing any modifications to the tree.

Does this skill support the Jujutsu (jj) version control system?

Yes, it specifically includes commands and workflows optimized for jj, though the logic for resolving conflicts is applicable to any version control system.

Why shouldn't I just use a fix-up commit after a conflict?

Fix-up commits create new problems to solve later. This skill teaches a 'one deliberate fix' approach to avoid divergent commits and messy undo loops in shared repositories.

How does it handle files that were moved and edited at the same time?

It treats these as 'Path + Content' conflicts, guiding you to resolve the file location first and then apply content changes to prevent the 'deceptive move' trap.

Resolve Conflicts

Name: Resolve Conflicts
Author: sjawhar

bysjawhar

•

Developer Tools

Streamlines complex Git and Jujutsu (jj) conflict resolution by prioritizing architectural comprehension over mechanical fixes.

The Resolve Conflicts skill provides a rigorous, 5-phase methodology for handling merge, rebase, and branch integration issues. Unlike traditional tools that focus on text manipulation, this skill emphasizes 'reading comprehension' by forcing an understanding of why both sides diverged before any changes are applied. It is particularly effective for 'deceptive' conflicts involving simultaneous file renames and content modifications, ensuring that developers maintain a clean commit history without resorting to risky undo loops or unnecessary fix-up commits.

Key Features

01Structured 5-phase resolution workflow (Map, Classify, Resolve, Verify, Push)

02Verification checks to ensure quality post-resolution

03Resolution strategies for 'Delete vs. Modify' and 'Path-only' scenarios

04Deep-dive analysis of parent-revision diffs to establish context

052 GitHub stars

06Specialized detection for path-level and rename-plus-content conflicts

Use Cases

01Managing divergent commits in shared repositories using the Jujutsu (jj) version control system

02Resolving complex rebases where files have been moved and modified across different branches

03Providing a step-by-step logic gate for developers to verify merge intent before touching the tree

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add sjawhar/dotfiles resolve-conflicts

For use in Claude.ai and ChatGPT

Download Skill