MichaelVessia/resolve-merge-conflicts
modules/programs/agents/shared/skills/resolve-merge-conflicts/SKILL.md
Resolve git merge conflicts for a GitHub PR. Accept a PR link/number when provided, otherwise infer the open PR for the current branch.
$ install --global
skillsauthnpx skillsauth add MichaelVessia/nixos-config resolve-merge-conflictsInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 30, 2026, 12:33 PM5.8s1 file scanned
SKILL.md
- name:
- resolve-merge-conflicts
- description:
- Resolve git merge conflicts for a GitHub PR. Accept a PR link/number when provided, otherwise infer the open PR for the current branch.
- allowed-tools:
- Bash(git *), Bash(gh *), Bash(rg *), Bash(npm test*), Bash(bun test*), Bash(pnpm test*), Bash(yarn test*), Bash(pytest*), Bash(go test*), Bash(cargo test*), Read, Edit, Write, Glob, Grep, TodoWrite
Resolve merge conflicts for a PR end to end.
Inputs
- Optional: PR URL or PR number.
- If missing, infer PR from current branch.
Workflow
- Create a
TodoWritelist. - Validate prerequisites:
git rev-parse --is-inside-work-treegh auth status- Working tree must be clean before starting (
git status --porcelain).
- Identify target PR:
- If user provided PR URL/number, use it.
- Else:
branch=$(git branch --show-current)gh pr list --state open --head "$branch" --json number,url,title,updatedAt- If none found, stop and ask user for PR URL/number.
- If multiple found, choose the most recently updated.
- Load PR metadata:
gh pr view <pr> --json number,url,title,headRefName,baseRefName,headRepositoryOwner
- Check out PR branch locally:
- Prefer
gh pr checkout <pr>. - If already in an in-progress merge/rebase for this PR branch, continue instead of restarting.
- Prefer
- Merge base into head to surface conflicts:
git fetch origin <baseRefName>git merge --no-ff --no-commit origin/<baseRefName>- If merge completes cleanly, commit merge and finish.
- If conflicts exist:
- List conflicted files:
git diff --name-only --diff-filter=U. - Resolve each file from first principles (do not blindly prefer ours/theirs).
- Preserve intended behavior from both sides where possible.
git addeach resolved file.- Verify no unresolved files remain.
- List conflicted files:
- Run relevant tests for changed/conflicted areas (targeted tests first).
- Finish merge:
- Ensure clean index except intended merge changes.
- Create merge commit with default merge message unless user requested custom message.
- Report:
- PR used (explicit or inferred),
- files resolved,
- tests run and results,
- any follow-up risk.
Rules
- Do not use
git checkout --theirsorgit checkout --oursas a blanket strategy. - Do not discard unrelated local changes.
- If conflict intent is ambiguous, stop and ask the user a focused question.
- Prefer minimal, behavior-preserving resolutions.
Related Skills
MichaelVessia/plannotator-visual-explainer
development
VerifiedTrustedCommunity
Generate self-contained HTML visualizations with Plannotator theming. Use for implementation plans, PR explainers, architecture diagrams, data tables, slide decks, and any visual explanation of technical concepts. Plans and PR explainers follow Plannotator's prescriptive approach; all other visual content delegates to nicobailon/visual-explainer.
2SKILL.mdUpdated Jun 12, 2026
MichaelVessia/plannotator-setup-goal
development
VerifiedTrustedCommunity
Turn an idea or objective into a goal package for /goal. Interviews the user, builds a reviewed fact sheet via Plannotator, then explores the codebase to produce an execution plan.
2SKILL.mdUpdated Jun 12, 2026
MichaelVessia/plannotator-review
development
VerifiedTrustedCommunity
Open Plannotator's browser-based code review UI for the current worktree or a pull request URL, then act on the feedback that comes back.
2SKILL.mdUpdated Jun 12, 2026
MichaelVessia/plannotator-last
testing
VerifiedTrustedCommunity
Open Plannotator on the latest rendered assistant message and use the returned annotations to revise that message or continue.
2SKILL.mdUpdated Jun 12, 2026