When should I use jj resolve instead of jj restore?

Use 'jj resolve' when you want semantic clarity (like choosing 'ours' or 'theirs') or when using external merge tools. Use 'jj restore' when you need to pull a file's state from a specific historical revision.

What is the fastest way to find all conflicts in a jj repo?

You can run 'jj log -r "conflicts()"' to see a visual representation of all commits currently containing unresolved conflicts.

How does Jujutsu handle conflicts differently than Git?

In Git, conflicts block your workflow until resolved. In Jujutsu, conflicts are first-class citizens stored in commits, allowing you to continue working on descendant commits and resolve the conflicts at your convenience.

Why is the path argument critical when using jj restore?

Without a path argument, 'jj restore --from @-' will restore every file from the parent, effectively deleting all your work in the current commit. Specifying a path ensures only the conflicted file is updated.

Jujutsu (jj) Conflict Resolver

Name: Jujutsu (jj) Conflict Resolver
Author: edmundmiller

byedmundmiller

•

Deployment & DevOps

Identifies and resolves version control conflicts in Jujutsu (jj) repositories using safe restoration and resolution patterns.

This skill provides specialized guidance for handling conflicts within the Jujutsu (jj) version control system. Unlike Git, which blocks operations during conflicts, Jujutsu stores conflicts within commits, allowing you to continue working. This skill helps you navigate this unique workflow by identifying conflicted commits, choosing between resolution strategies like 'jj resolve' and 'jj restore', and enforcing critical safety rules—specifically the importance of path-specific restorations to prevent accidental data loss.

Key Features

01Identifies all conflicted commits using specialized revsets like 'conflicts()'

02Offers batch processing scripts for resolving conflicts across multiple commits

03Explains Jujutsu-specific conflict markers and manual resolution strategies

0440 GitHub stars

05Provides semantic resolution using 'jj resolve' with :ours and :theirs tools

06Implements safe 'jj restore' patterns with mandatory path arguments

Use Cases

01Resolving '2-sided conflicts' occurring after a complex rebase

02Fixing deletion conflicts caused by untracking files in .gitignore

03Safely restoring specific file paths from parent revisions without losing other work

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add edmundmiller/dotfiles jj-conflicts

For use in Claude.ai and ChatGPT

Download Skill