mattpocock/resolvendo-conflitos-de-merge

Use quando precisar resolver um conflito de merge/rebase em andamento.

O que é resolvendo-conflitos-de-merge?

Esta skill guia o agente de IA através do processo de resolução de conflitos de merge ou rebase no Git. Ela fornece uma abordagem estruturada em cinco etapas: entender o estado atual do merge, identificar as fontes primárias de cada conflito lendo commits, PRs e tickets relacionados, resolver cada hunk preservando ao máximo as intenções originais, executar verificações automatizadas como typecheck e testes, e finalizar o merge ou rebase. A skill enfatiza que nunca se deve abortar o processo, mas sim resolver todos os conflitos. É útil para desenvolvedores que trabalham com Git e precisam de um guia confiável para lidar com conflitos de forma segura e eficiente.

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

Installed? Explore more Programação e Desenvolvimento skills: steipete/bluebubbles, steipete/eightctl, steipete/blucli · View all 6 →

Perguntar na sua IA favorita

Abre um novo chat com esta habilidade de agente já pré-carregada.

Documentação

  1. Veja o estado atual do merge/rebase. Verifique o histórico do git e os arquivos conflitantes.

  2. Encontre as fontes primárias de cada conflito. Entenda profundamente por que cada alteração foi feita e qual era a intenção original. Leia as mensagens de commit, verifique os PRs, e confira os issues/tickets originais.

  3. Resolva cada hunk. Preserve ambas as intenções sempre que possível. Quando incompatíveis, escolha aquela que corresponde ao objetivo declarado do merge e anote a compensação. Não invente novos comportamentos. Sempre resolva; nunca --abort.

  4. Descubra as verificações automatizadas do projeto e execute-as — normalmente typecheck, depois testes, depois formatação. Corrija o que o merge quebrou.

  5. Finalize o merge/rebase. Prepare tudo e faça o commit. Se estiver fazendo um rebase, continue o processo de rebase até que todos os commits sejam reorganizados.

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.

Habilidades Relacionadas