CommunityProgramación y desarrollogithub.com

mattpocock/resolver-conflictos-de-fusión

Úsalo cuando necesites resolver un conflicto de fusión/rebase en curso en git.

¿Qué es resolver-conflictos-de-fusión?

Este skill permite a un agente de IA resolver conflictos de fusión y rebase en repositorios git de manera estructurada y segura. Proporciona un flujo de cinco pasos que comienza con la inspección del estado actual del merge, seguido de la identificación profunda de las fuentes originales de cada cambio (commits, PRs, tickets) para comprender la intención detrás de cada modificación. Luego guía al agente en la resolución de cada hunk conflictivo, preservando ambas intenciones cuando sea posible o eligiendo la que se alinee con el objetivo del merge, registrando siempre la decisión y evitando inventar comportamiento nuevo. Finalmente, instruye ejecutar verificaciones automatizadas del proyecto (typecheck, tests, formato) y completar el proceso de fusión o rebase sin necesidad de abortar. Es compatible con cualquier repositorio git y herramientas que deleguen en git para gestión de versiones.

Compatible con~Claude Code~Codex CLI~Cursor
npx skills add https://github.com/mattpocock/skills/tree/main/skills/engineering/resolving-merge-conflicts

Installed? Explore more Programación y desarrollo skills: steipete/bluebubbles, steipete/eightctl, steipete/blucli · View all 6 →

Preguntar en tu IA favorita

Abre un nuevo chat con esta habilidad de agente ya precargada.

Documentación

  1. Ve el estado actual de la fusión/rebase. Revisa el historial de git y los archivos en conflicto.

  2. Encuentra las fuentes primarias de cada conflicto. Comprende profundamente por qué se hizo cada cambio y cuál era la intención original. Lee los mensajes de commit, revisa los PRs, consulta los issues/tickets originales.

  3. Resuelve cada hunk. Preserva ambas intenciones cuando sea posible. Cuando sean incompatibles, elige la que coincida con el objetivo declarado de la fusión y anota la compensación. No inventes comportamiento nuevo. Siempre resuelve; nunca uses --abort.

  4. Descubre las verificaciones automatizadas del proyecto y ejecútalas — típicamente typecheck, luego pruebas, luego formato. Arregla cualquier cosa que la fusión haya roto.

  5. Finaliza la fusión/rebase. Agrega todo al staging y haz commit. Si estás haciendo rebase, continúa el proceso de rebase hasta que todos los commits estén rebasados.

Individual skills in this repo

This repo contains 20 individual skills — each has its own dedicated page.

mattpocock/ask-matt

Ask which skill or flow fits your situation. A router over the skills in this repo.

mattpocock/caveman

Ultra-compressed communication mode. Cuts token usage ~75% by dropping filler, articles, and pleasantries while keeping full technical accuracy. Use when user says "caveman mode", "talk like caveman", "use caveman", "less tokens", "be brief", or invokes /caveman.

mattpocock/claude-handoff

Hand the current conversation off to a fresh background agent that picks up the work immediately.

mattpocock/codebase-design

Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find deepening opportunities, decide where a seam goes, make code more testable or AI-navigable, or when another skill needs the deep-module vocabulary.

mattpocock/design-an-interface

Generate multiple radically different interface designs for a module using parallel sub-agents. Use when user wants to design an API, explore interface options, compare module shapes, or mentions "design it twice".

mattpocock/diagnose

Disciplined diagnosis loop for hard bugs and performance regressions. Reproduce → minimise → hypothesise → instrument → fix → regression-test. Use when user says "diagnose this" / "debug this", reports a bug, says something is broken/throwing/failing, or describes a performance regression.

mattpocock/diagnosing-bugs

Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing/slow.

mattpocock/domain-modeling

Build and sharpen a project's domain model. Use when the user wants to pin down domain terminology or a ubiquitous language, record an architectural decision, or when another skill needs to maintain the domain model.

mattpocock/edit-article

Edit and improve articles by restructuring sections, improving clarity, and tightening prose. Use when user wants to edit, revise, or improve an article draft.

mattpocock/git-guardrails-claude-code

Set up Claude Code hooks to block dangerous git commands (push, reset --hard, clean, branch -D, etc.) before they execute. Use when user wants to prevent destructive git operations, add git safety hooks, or block git push/reset in Claude Code.

mattpocock/grilling

Grill the user relentlessly about a plan or design. Use when the user wants to stress-test a plan before building, or uses any 'grill' trigger phrases.

mattpocock/grill-me

Interview the user relentlessly about a plan or design until reaching shared understanding, resolving each branch of the decision tree. Use when user wants to stress-test a plan, get grilled on their design, or mentions "grill me".

mattpocock/grill-with-docs

Grilling session that challenges your plan against the existing domain model, sharpens terminology, and updates documentation (CONTEXT.md, ADRs) inline as decisions crystallise. Use when user wants to stress-test a plan against their project's language and documented decisions.

mattpocock/handoff

Compact the current conversation into a handoff document for another agent to pick up.

mattpocock/implement

Implement a piece of work based on a PRD or set of issues.

mattpocock/implement-spec

Implement a specification in code.

mattpocock/improve-codebase-architecture

Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.

mattpocock/loop-me

Grill me about specs for the workflows I want to build, within this workspace.

mattpocock/migrate-to-shoehorn

Migrate test files from `as` type assertions to @total-typescript/shoehorn. Use when user mentions shoehorn, wants to replace `as` in tests, or needs partial test data.

mattpocock/obsidian-vault

Search, create, and manage notes in the Obsidian vault with wikilinks and index notes. Use when user wants to find, create, or organize notes in Obsidian.

Skills relacionados