home/categories/automation-tools/antinomyhq-forge-forge-skills-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.

antinomyhq
maintainer
antinomyhq
更新於 2026/1/19
星標
4569
分支
1171
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