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

•

Herramientas para Desarrolladores

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

Acerca de

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.

Características Principales

40 GitHub stars
Repair conflicted local and remote bookmarks
Revert merge commits by restoring first-parent states
Identify and resolve divergent changes with multiple heads
Navigate Jujutsu's snapshot-based merge model
Interpret and handle '(empty)' merge commits correctly

Casos de Uso

Undoing a merge commit to restore the state of a specific parent
Fixing bookmark conflicts after fetching from remote repositories
Resolving divergent changes caused by concurrent edits in different workspaces

Acerca de

Características Principales

40 GitHub stars
Repair conflicted local and remote bookmarks
Revert merge commits by restoring first-parent states
Identify and resolve divergent changes with multiple heads
Navigate Jujutsu's snapshot-based merge model
Interpret and handle '(empty)' merge commits correctly

Casos de Uso

Undoing a merge commit to restore the state of a specific parent
Fixing bookmark conflicts after fetching from remote repositories
Resolving divergent changes caused by concurrent edits in different workspaces