Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.
Inicia sesión para votar.
New here? These commands run inside Claude Code, Anthropic's terminal-based coding assistant — not your regular shell. Open a terminal, type claude to start a session, then paste the two lines below inside it.
npx skills add warpdotdev/common-skills --skill "resolve-merge-conflicts" -a claude-code -g -yPaste into a Claude Code session. This only adds/installs the plugin — nothing runs automatically.
O, si ya vinculaste skillcat-sync, envíalo directamente — te pedirá confirmar antes de tocar nada.
This listing is sourced from warpdotdev/common-skills. The security badge above comes from a third-party audit (skills.sh) — we haven't independently executed or reviewed this code ourselves. Review the source before installing.
¿Eres el autor y quieres corregir algo de este listado, o pedir que lo quitemos? Escribe a autores@skillcat.es.