Skip to content

rse/ase / plugin/skills/ase-repo-resolve

ase-repo-resolve

Verified

Resolve 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.

@${CLAUDE_SKILL_DIR}/../../meta/ase-control.md @${CLAUDE_SKILL_DIR}/../../meta/ase-skill.md @${CLAUDE_SKILL_DIR}/../../meta/ase-dialog.md @${CLAUDE_SKILL_DIR}/../../meta/ase-getopt.md

$ARGUMENTS

@${CLAUDE_SKILL_DIR}/../../meta/ase-common-resolve.md

Procedure

    1. Set to with any leading and trailing whitespace stripped. Do not output anything.

    2. Resolve the conflicts by expanding the following:

    1. If is not RESOLVED or is none, skip this entire STEP 2, as either conflicts remain or there is no operation to continue (e.g., after git stash apply or patch --merge).

    2. Run the command git -C "<repo-root/>" diff --name-only --diff-filter=U. If its output is not empty (unmerged files outside of remain), only output the following and skip the remaining items of this STEP 2:

    3. Continue the operation by running the command git -C "<repo-root/>" -c core.editor=true <resolve-operation/> --continue, which keeps the prepared commit message without opening an editor.

    1. Report the escalations by expanding the following:

    2. Only output the following :

receiving-code-reviewobra/superpowersUse when receiving code review feedback, before implementing suggestions, especially if feedback seems unclear or technically questionable - requires technical rigor and verification, not performative agreement or blind implementationStars: 322kUpdated Claude CodeCodexVerifiedInstall
requesting-code-reviewobra/superpowersUse when completing tasks, implementing major features, or before merging to verify work meets requirementsStars: 322kUpdated Claude CodeCodexVerifiedInstall
using-git-worktreesobra/superpowersUse when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallbackStars: 322kUpdated Claude CodeCodexVerifiedInstall
verification-before-completionobra/superpowersUse when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming output before making any success claims; evidence before assertions alwaysStars: 322kUpdated Claude CodeCodexVerifiedInstall