specsfy-specialist-merge-conflict-resolution
From the author
Resolver conflitos Git de merge ou rebase pela intenção de cada lado, preservando comportamento e validando integração. Use quando já existe operação com arquivos unmerged; não abortar, reescrever histórico remoto ou escolher um lado inteiro sem autorização.
Install
npx skills add promovaweb/specsfy --skill specsfy-specialist-merge-conflict-resolution -a claude-code
Installs to .claude/skills/specsfy-specialist-merge-conflict-resolution/ · Each command fetches the skill straight from GitHub with the open skills CLI.
No download: this skill’s licence (No licence) does not let us redistribute its files. The install commands fetch them from GitHub instead.
Want your agent to suggest skills while you type? See how to use skills from your IDE.
Safety checks on SKILL.md
No warnings.
Why 75
aiqbench computes the trust score from public signals. It is not a security audit, so read a skill before you install it.
Similar skills
Closest to this one by what they do and when they are used.
- resolving-merge-conflictstt-a1i/matt-skills-with-to-goalUse when you need to resolve an in-progress git merge/rebase conflict.Engineering★ 187
- ase-repo-resolverse/aseResolve the Git merge conflicts of a working directory -- of an in-progress merge, rebase, cherry-pick, revert, stash apply, or of conflict markers left by patch -- carefully and semantically, never losing any change, escalate unresolvable hunks as-is, continue the in-progress operation, and emit a RESOLVED, PARTIAL, NONE, or FAILED verdict. Use when the user calls to "resolve" or "fix" merge conflicts.Engineering★ 60
- ase-repo-mergerse/aseMerge a Git source branch, including its still uncommitted changes, into a target branch through a regular merge, a rebase with fast-forward, or a squash merge, resolving merge conflicts semantically, check that the source branch landed, and emit a MERGED, CONFLICT, or FAILED verdict. Use when the user calls to "merge", "integrate", or "land" a branch.Engineering★ 60
- fix-merge-conflictsmichael-denyer/pstack-claudeResolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolutionTesting★ 3.4K
- specsfy-specialist-gitflowpromovaweb/specsfyAplicar e revisar o modelo Gitflow de branches (main, develop, feature/*, release/*, hotfix/*, support/*), convenção de nomes, política de merge e sequência de release/hotfix. Use quando o projeto adotar Gitflow explicitamente ou a pessoa pedir esse fluxo de branches; use também para nomear, sequenciar e fechar feature/release/hotfix num projeto que já declarou Gitflow; não proponha Gitflow por inferência a partir da estrutura do repositório, não use para resolver conflito já aberto (`$specsfy-specialist-merge-conflict-resolution`) nem para desenhar o pipeline de CI/CD (`$specsfy-specialist-delivery-engineering`).Planning★ 87
- concurrent-brancheskajisho5/ffmpeg-skillResolve conflicts and merges when several branches are open against one repo at the same time — the hotspot files every change must touch (registry manifests, a single version field, shared tool config, one aggregated test module, tracked build output), union-vs-recompute-vs-rebuild as three different correct resolutions, generated artifacts that must never be merged, non-deterministic serialization that makes every branch conflict, renumbered identifiers that git cannot show you, and why a clean auto-merge is not a passing test. Use when rebasing or merging a long-lived branch, resolving conflict markers, reviewing a merge commit, deciding what a repo should commit vs generate, or setting up a repo that will take parallel contributions.Testing★ 2.7K
Ratings & reviews
—
no reviews
Tried this skill? Rate it to help others. Sign in
Discussion
Join the discussion. Sign in