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