knowledge-basedocumentation
jj-fix-conflicts
Fix merge conflicts in a jj change and its ancestors, starting from the oldest conflict. Use this when a jj change or its ancestors have conflicts that need resolving.
maintainer
RediSearch
Updated 3/16/2026
Stars
6118
Forks
578
quick start
Installation and usage
Fix merge conflicts in a jj change and its ancestors, starting from the oldest conflict. Use this when a jj change or its ancestors have conflicts that need resolving.
Installation
$ install --globalskills.sh
Usage
Once installed, you can use this skill by running the following command in your terminal:
skills use jj-fix-conflicts