Understanding Jujutsu Merges and Conflicts
CommunityMaster JJ merges, conflicts, and divergent changes.
Authoredmundmiller
Version1.0.0
Installs0
System Documentation
What problem does it solve?
This Skill explains how JJ handles merges, why merge commits can appear "(empty)", how to revert merges, and how to deal with divergent changes and conflicted bookmarks.
Core Features & Use Cases
- Merge semantics: Understand how merge commits capture your changes relative to auto-merge.
- Reverting merges: Learn safe patterns to undo a merge without losing context.
- Divergence handling: Identify and resolve divergent changes and conflicted bookmarks.
Quick Start
Create a merge, observe whether it is "(empty)", then use the recommended revert approach to undo if needed.
Dependency Matrix
Required Modules
None requiredComponents
references
💻 Claude Code Installation
Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.
Please help me install this Skill: Name: Understanding Jujutsu Merges and Conflicts Download link: https://github.com/edmundmiller/dotfiles/archive/main.zip#understanding-jujutsu-merges-and-conflicts Please download this .zip file, extract it, and install it in the .claude/skills/ directory.