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
更新於 3/16/2026
星標
6118
分支
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.
安裝
$ install --globalskills.sh
使用
安裝後，您可以透過在終端機執行以下指令來使用此技能：
skills use jj-fix-conflicts