Stats
Actions
Tags
'%20stop-opacity%3D'0.16'%2F%3E%3Cstop%20offset%3D'1'%20stop-color%3D'rgb(200%2C90%2C60)'%20stop-opacity%3D'0.03'%2F%3E%3C%2FlinearGradient%3E%3C%2Fdefs%3E%3Crect%20width%3D'320'%20height%3D'200'%20fill%3D'url(%23g)'%2F%3E%3Ccircle%20cx%3D'250'%20cy%3D'56'%20r%3D'92'%20fill%3D'rgb(200%2C90%2C60)'%20fill-opacity%3D'0.06'%2F%3E%3Ccircle%20cx%3D'64'%20cy%3D'172'%20r%3D'58'%20fill%3D'rgb(200%2C90%2C60)'%20fill-opacity%3D'0.05'%2F%3E%3C%2Fsvg%3E)
From leandrocfe-skills
Resolves active git merge or rebase conflicts by analyzing commit history, understanding intent, and preserving both changes when possible.
How this skill is triggered — by the user, by Claude, or both
Slash command
/leandrocfe-skills:resolving-merge-conflictsThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
1. **Veja o estado atual** do merge/rebase. Confira o histórico do git e os arquivos em conflito.
Veja o estado atual do merge/rebase. Confira o histórico do git e os arquivos em conflito.
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.
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.
Descubra os checks automatizados do projeto e rode — tipicamente typecheck, depois testes, depois format. Corrija qualquer coisa que o merge quebrou.
Finalize o merge/rebase. Stage tudo e commit. Se estiver em rebase, continue o processo de rebase até todos os commits serem rebaseados.
npx claudepluginhub leandrocfe/skillsWalks through resolving in-progress git merge or rebase conflicts by understanding change intent, preserving both sides where possible, and running project checks before finishing.
Resolves in-progress git merge or rebase conflicts by analyzing history, understanding intent, and preserving both changes where possible. Runs automated checks after resolution.
Resolves in-progress git merge or rebase conflicts by analyzing git history, understanding change intent, resolving hunks, running automated checks, and completing the merge.