fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Datos de origen
- Repositorio
- cursor/plugins
- Última actividad en el origen
- 17 de febrero de 2026 a las 18:01
- Idioma detectado de SKILL.md
- inglés
- Estrellas
- 10.860
- Forks
- 1037
Opciones de instalación
De forma predeterminada está seleccionado el prompt que primero revisa el origen. Puedes cambiar a un comando directo o descargar una copia local.
Revisa los archivos de origen
Lee SKILL.md y los archivos complementarios que muestra SkillsMP antes de decidir si quieres instalarlo.
Mostrando SKILL.md
SKILL.md
Instrucciones de origen · Vista previa de solo lectura- name
- fix-merge-conflicts
- description
- Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
# Fix merge conflicts
## Trigger
Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
## Workflow
1. Detect all conflicting files from git status and conflict markers.
2. Resolve each conflict with minimal, correctness-first edits.
3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
4. Regenerate lockfiles with package manager tools instead of hand-editing.
5. Run compile, lint, and relevant tests.
6. Stage resolved files and summarize key decisions.
## Guardrails
- Keep changes minimal and readable.
- Do not leave conflict markers in any file.
- Avoid broad refactors while resolving conflicts.
- Do not push or tag during conflict resolution.
## Output
- Files resolved
- Notable resolution choices
- Build/test outcome
Ver en GitHub