resolving-merge-conflicts
Use when resolving an in-progress git merge/rebase conflict, or when the user says "resolve merge conflict" or "fix merge conflict".
Skill by supagetto
Install
Works with Claude Code, Claude apps, Codex, Cursor, Gemini CLI, GitHub Copilot, VS Code, OpenCode, Goose, Windsurf. Read the repository before you give any tool access to your data.
npx agentmarket install skill/supagetto-resolving-merge-conflicts
Asks which of your tools to add it to (Claude Code, Codex, Cursor, VS Code, Windsurf, Gemini CLI, Claude Desktop) and shows the change first. See https://agentmart.dev/cli.
Get the weekly diff
The weekly diff: one email a week with new agent tools, notable updates and grade changes, plus security alerts for tools you follow. Double opt-in, one-click unsubscribe.
About
Reviews
Write a reviewNo reviews yet. Installed it? Reviews come from verified installers only. How reviews work
Permissions
What this skill can do and what it asks for, from its SKILL.md. Checked Oct 25, 2026.
- Tools
- No tools found
- Secrets
- None asked for
- Install scripts
- None found
Network hosts it talks to 1
codeload.github.com· found in install command
Files it touches
~/.claude/skills/resolving-merge-conflicts
What's inside
- Skill name
resolving-merge-conflicts- Description
- Use when resolving an in-progress git merge/rebase conflict, or when the user says "resolve merge conflict" or "fix merge conflict".
- License
- MIT
- Instructions
- 11 lines in SKILL.md · view on GitHub
Files (1)
- SKILL.md
SKILL.md (first lines)
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files. 2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check the original specs and tasks (see the using-workbench skill for where to find them). 3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`. 4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke. 5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
From supagetto/README.ai, MIT.
More from supagetto/README.ai
- 0.570score
setting-up-graft
supagetto
Use when graft/ or .serena/ is not git-ignored, or graft cards are not greppable by ripgrep, or the user asks to set up graft.
SkillAFreshness: AClaude Code +9 - 0.569score
reading-web-pages
supagetto
Read the main content of a web page URL as markdown.
SkillAFreshness: AClaude Code +9 - 0.565score
huddling
supagetto
Pressure-test a decision with a crew of five voices who answer independently, peer-review each other anonymously, and get a verdict from bigbrain.
SkillAFreshness: AClaude Code +9 - 0.565score
reviewing-spec-implementations
supagetto
Review changes since a fixed point against the originating spec.
SkillAFreshness: AClaude Code +9 - 0.564score
creating-tasks
supagetto
Break a plan, spec, or conversation into tracer-bullet tasks with blocking edges.
SkillAFreshness: AClaude Code +9 - 0.564score
implementing-specs
supagetto
Implement work from a spec and its tasks.
SkillAFreshness: AClaude Code +9 - 0.564score
removing-ai-tells
supagetto
Remove AI tells from prose.
SkillAFreshness: AClaude Code +9 - 0.564score
writing-commit-messages
supagetto
Use when writing a commit message or when the user says "commit change".
SkillAFreshness: AClaude Code +9 - 0.564score
creating-questionnaires
supagetto
Create a questionnaire for someone else to fill in.
SkillAFreshness: AClaude Code +9 - 0.564score
creating-specs
supagetto
Synthesize the current conversation into a spec.
SkillAFreshness: AClaude Code +9 - 0.560score
describing-changes
supagetto
Use when showing the shape of a change as pseudocode views.
SkillAFreshness: AClaude Code +9 - 0.559score
requesting-clarification
supagetto
Use when the user signals confusion about your last message, including short interjections like "wait", "what", "huh", or "again".
SkillAFreshness: AClaude Code +9
Signals
- Stars
- 0
- Forks
- 0
- Open issues
- 0
- Last commit (this folder)
- Oct 5, 2026 (24 days ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- MIT
- Repository
- github.com/supagetto/README.ai
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from supagetto
- 0.570score
setting-up-graft
supagetto
Use when graft/ or .serena/ is not git-ignored, or graft cards are not greppable by ripgrep, or the user asks to set up graft.
SkillAFreshness: AClaude Code +9 - 0.569score
reading-web-pages
supagetto
Read the main content of a web page URL as markdown.
SkillAFreshness: AClaude Code +9 - 0.565score
huddling
supagetto
Pressure-test a decision with a crew of five voices who answer independently, peer-review each other anonymously, and get a verdict from bigbrain.
SkillAFreshness: AClaude Code +9 - 0.565score
reviewing-spec-implementations
supagetto
Review changes since a fixed point against the originating spec.
SkillAFreshness: AClaude Code +9 - 0.564score
creating-tasks
supagetto
Break a plan, spec, or conversation into tracer-bullet tasks with blocking edges.
SkillAFreshness: AClaude Code +9 - 0.564score
creating-specs
supagetto
Synthesize the current conversation into a spec.
SkillAFreshness: AClaude Code +9
Cite this page
resolving-merge-conflicts skill. Agent Mart. https://agentmart.dev/skills/supagetto-resolving-merge-conflicts (last updated 2026-10-24)