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
Использование
После установки вы можете использовать этот skill, выполнив следующую команду в терминале:
skills use jj-fix-conflicts