Menu
Resolver conflitos de merge/rebase de forma estruturada. Inspirado por mattpocock/skills.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Shared vocabulary for designing deep modules — depth, seams, adapters, testability. Inspirado por mattpocock/skills.
Disposable experiments to validate an idea before committing to a build. Validate feasibility, compare approaches, surface unknowns. Also covers quick prototypes to answer a single design question (logic or UI).
Evolve prompts, code, and configurations through reflective optimization with AI feedback.
Regression testing patterns for AI-assisted development. Sandbox/production path parity, response shape contracts, data completeness, and patterns to catch AI blind spots.
REST API design patterns — resource naming, HTTP semantics, status codes, versioning, pagination, error handling, rate limiting, and OpenAPI specs. Use when designing or reviewing REST APIs.
Guard your API: JWT, OAuth 2.0, RBAC, sessions, and API key patterns for secure authentication and authorization.
| name | resolving-merge-conflicts |
| description | Resolver conflitos de merge/rebase de forma estruturada. Inspirado por mattpocock/skills. |
| version | 1.0.0 |
| metadata | {"source":"github.com/mattpocock/skills"} |
Veja o estado atual do merge/rebase. Confira git history e os arquivos conflitantes.
Encontre as fontes primárias de cada conflito. Entenda por que cada change foi feita. Leia commit messages, PRs, issues originais.
Resolva cada hunk. Preserve ambas as intenções onde possível. Onde incompatível, escolha a que melhor atende o objetivo do merge e documente o trade-off. Nunca invente comportamento novo. Sempre resolva; nunca --abort.
Descubra e execute os checks automáticos do projeto — typecheck, tests, linter. Corrija o que o merge quebrou.
Finalize o merge/rebase. Stage tudo e commit. Se for rebase, continue até todos os commits serem rebaseados.
Merge concluído com sucesso, todos os checks passando, e cada decisão de conflito documentada no commit message.
