Skip to content

winrecoveryproject/plugin-skill-studio

v0.3.2MIT

Self-contained local plugin and skill creation, discovery, evidence, evaluation, risk review, conversion and deterministic packaging. Host execution capabilities and explicit public lookups remain separate.

GitHub
skills

resolving-merge-conflicts

Resolve in-progress git merge or rebase conflicts by intent traced to primary sources. Use when hit with merge conflicts, CONFLICT markers in files, rebase pauses, or when git prompts to resolve conflicted hunks — even if the user just says "fix this merge". Do NOT use for creating new branches or routine rebasing without conflicts.

Read SKILL.md at the source

Pinned to revision c17bbea17056, so it is the text this page describes rather than whatever the author pushed since.

Files

Every link opens the file at its source, pinned to the revision this page describes.