How do I revert a merge in Jujutsu?

Create a new commit on top of the merge using 'jj new', then use 'jj restore --from' pointing to the first parent (MERGE-) to return the state to that parent's content.

How do I resolve bookmark conflicts?

Use 'jj bookmark move --to ' to explicitly point the bookmark to the desired local or remote commit, resolving the multi-pointer conflict.

Why does my Jujutsu merge commit appear as (empty)?

In jj, a merge commit only shows changes relative to the auto-merge. If the auto-merge was clean and you didn't add manual changes, the commit is correctly shown as empty.

What causes divergent changes in jj?

Divergence happens when the same change ID points to multiple commits, often due to concurrent operations in different workspaces or manual commit creation with duplicate IDs.

Jujutsu Merges and Conflicts

Name: Jujutsu Merges and Conflicts
Author: edmundmiller

byedmundmiller

•

Productivity & Workflow

Manages Jujutsu (jj) merge commits, resolves divergent changes, and handles bookmark conflicts using snapshot-based version control principles.

This skill provides specialized guidance for mastering the unique snapshot-based merging model of Jujutsu (jj). It helps developers understand why merge commits often appear empty, provides step-by-step instructions for reverting merges without losing history, and offers strategies for resolving divergent changes and bookmark conflicts. By leveraging these patterns, users can navigate complex version control states that differ from traditional Git workflows, ensuring a clean and manageable repository history.

Key Features

0140 GitHub stars

02Repair conflicted local and remote bookmarks

03Revert merge commits by restoring first-parent states

04Identify and resolve divergent changes with multiple heads

05Navigate Jujutsu's snapshot-based merge model

06Interpret and handle '(empty)' merge commits correctly

Use Cases

01Undoing a merge commit to restore the state of a specific parent

02Fixing bookmark conflicts after fetching from remote repositories

03Resolving divergent changes caused by concurrent edits in different workspaces

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add edmundmiller/dotfiles jj-merges-and-conflicts

For use in Claude.ai and ChatGPT

Download Skill