home/categories/knowledge-base/tailcallhq-forgecode-forge-skills-resolve-conflicts-skill-md
knowledge-basedocumentation

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.

tailcallhq
maintainer
tailcallhq
Actualizado 11/27/2025
Estrellas
6426
Forks
1330
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.

Instalación
$ install --globalskills.sh
Uso

Después de instalarlo, puedes usar este skill ejecutando el siguiente comando en tu terminal:

skills use resolve-conflicts