Understanding Jujutsu Merges and Conflicts

Merge commits appear empty when your changes are already captured in the auto_merge baseline. Jujutsu records only your changes relative to the automatic merge result, so if the merge resolved cleanly without additional modifications, the commit shows as (empty). Use `jj show` to inspect merge_commit_diff and confirm the merge was applied correctly.

Use `jj new` to create a commit on top of the merge, then apply `jj restore` to revert the merged changes while preserving the merge commit history. This maintains a clear record of what was merged and undone, unlike deleting the merge entirely.

Conflicted bookmarks occur when divergent changes create incompatible branch states. Use `jj log` to identify divergent commits, then `jj merge` to combine branches explicitly or `jj bookmark` commands to resolve conflicts by choosing which branch state to keep.

Auto_merge is Jujutsu's automatic conflict resolution baseline. Your merge commit captures only changes relative to auto_merge. Use `jj show` with merge_commit_diff to see what you actually modified beyond the automatic resolution.

Yes. Use `jj show` to preview merge_commit_diff and verify the merge result. Use `jj log` to trace how divergent changes interact. This lets you confirm the merge behaves as expected before finalizing.

Identify divergent changes with `jj log`. Create a merge using `jj merge` to explicitly combine branches. Resolve conflicted bookmarks by inspecting the result with `jj show` and using `jj restore` or `jj bookmark` to align state across branches.