Marketplace
fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Resumen
Su SKILL.md se queda en GitHub
Este repositorio no tiene una licencia que le permita a Deska mostrar sus archivos aquí. Lee el SKILL.md en GitHub antes de instalarla.
Archivos 1 archivo
Instálala a mano
Deska ejecuta esto por ti, para cada agente que elijas. Para ejecutarlo tú en una terminal:
npx skills add cursor/plugins --skill fix-merge-conflictsMás de cursor
- unslopcursorCut AI tells from any writing. Must always apply.20.9 k instalaciones en skills.sh0
- typescript-best-practicescursorTypeScript best practices. Use when reading or editing any .ts or .tsx file.5,800 instalaciones en skills.sh0
- architectcursorSketch types, signatures, and module structure before code, then stay in the loop while implementation fills in. Use for /architect, 'architect this', 'design this', or non-trivial work where jumping to code would lock in the wrong shape.3,700 instalaciones en skills.sh0
- principle-encode-lessons-in-structurecursorApply when you catch yourself writing the same instruction a second time, or notice a recurring correction. Encode the rule as a lint, metadata flag, runtime check, or script instead of more text.3,700 instalaciones en skills.sh0
- technical-writingcursorLayered technical-writing standard: Diátaxis structure, Google developer style sentences, STE instruction rules, Global English syntax. Use for /technical-writing or when writing or reviewing docs, RFCs, readmes, PR descriptions, or commit messages.3,700 instalaciones en skills.sh0
