mcpField
R
resolving-merge-conflicts

resolving-merge-conflicts

github.com/leandrocfeDevelopment4190 installsUpdated 12w ago
Repository

About resolving-merge-conflicts

A merge-conflict resolution skill that guides agents through inspecting Git state, researching the intent behind changes, resolving conflicts, running checks, and completing the merge or rebase.

Key features

  1. 01Inspect merge or rebase state and conflicted files
  2. 02Research change intent through commits, PRs, and issues
  3. 03Resolve hunks while preserving compatible intentions
  4. 04Run project checks and fix regressions
  5. 05Stage changes and complete merge or rebase

Use cases

  1. 01Resolve conflicts during a Git merge
  2. 02Reconcile conflicting changes during rebase
  3. 03Validate and finalize a conflict resolution

Install

Copy the command and run it in a terminal.

$npx skills add https://github.com/leandrocfe/skills --skill resolving-merge-conflicts

After installing, type/resolving-merge-conflictsin Claude Code to confirm it loaded.

Bundled filesagents/openai.yaml

Details

From the project README

  1. Veja o estado atual do merge/rebase. Confira o histórico do git e os arquivos em conflito.

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

  3. Resolva cada hunk. Preserve ambas as intenções quando possível. Onde forem incompatíveis, escolha a que bate com o objetivo declarado do merge e note o trade-off. Não invente comportamento novo. Sempre resolva; nunca --abort.

  4. Descubra os checks automatizados do projeto e rode — tipicamente typecheck, depois testes, depois format. Corrija qualquer coisa que o merge quebrou.

  5. Finalize o merge/rebase. Stage tudo e commit. Se estiver em rebase, continue o processo de rebase até todos os commits serem rebaseados.

Comments

Markdown supported