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