home/categories/automation-tools/ynulihao-agentskillos-data-skill-seeds-resolve-conflicts-skill-md
automation-toolstools

resolve-conflicts

Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.

ynulihao
maintainer
ynulihao
آخر تحديث 1/25/2026
النجوم
355
التفرعات
35
quick start

Installation and usage

Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.

التثبيت
$ install --globalskills.sh
الاستخدام

بعد التثبيت، يمكنك استخدام هذه المهارة بتشغيل الأمر التالي في الطرفية:

skills use resolve-conflicts