resolve-conflicts
Resolve git merge/rebase conflicts in a file using its history and the in-progress operation as context.
Skill by xxKeefer
Chalk Labs
Need help deploying resolve-conflicts?
Chalk Labs sets up agents like this inside real teams: connected to your tools, tested on your data, with a human in the loop where it matters.
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/xxkeefer-resolve-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
Use cases: testing
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/resolve-conflicts
What's inside
- Skill name
resolve-conflicts- Description
- Resolve git merge/rebase conflicts in a file using its history and the in-progress operation as context. Simple conflicts resolve automatically; complex ones (both sides added, or a migration/refactor collided with edits) pause for the user with evidence and a justified recommendation. Then follows links to conflicted test siblings and refactor parents/children. Usage: resolve-conflicts <filepath>. Use when the user says "resolve conflicts", "fix the merge", "resolve this conflict", or hands you a conflicted file.
- License
- unknown
- Instructions
- 112 lines in SKILL.md · view on GitHub
Files (1)
- SKILL.md
The license isn't open source, so the instructions aren't shown here. Read SKILL.md on GitHub
More from xxKeefer/skills
- 0.519score
explain-reasoning
xxKeefer
Explain the reasoning behind decisions, conclusions, or suggestions made in the current conversation.
SkillBFreshness: BClaude Code +9 - 0.469score
to-plan
xxKeefer
Break a task into an executable plan for /implement — or skip planning if the task is simple enough.
SkillCFreshness: CClaude Code +9 - 0.469score
to-tickets-old
xxKeefer
Turn a /spike output into tracker tickets ready for /to-plan or /implement.
SkillCFreshness: CClaude Code +9 - 0.469score
sync-docs
xxKeefer
Analyze current code changes and update all documentation that has fallen out of sync.
SkillCFreshness: CClaude Code +9 - 0.469score
diagnose
xxKeefer
Track down a bug whose root cause is not obvious -- the head-scratchers that need deep code exploration and tracing.
SkillCFreshness: CClaude Code +9 - 0.469score
spike
xxKeefer
Deep-dive investigation of a feature, bug, or technical problem.
SkillCFreshness: CClaude Code +9 - 0.469score
happy-path
xxKeefer
Generate a manual QA test plan for the current changeset.
SkillCFreshness: CClaude Code +9 - 0.469score
resolve-feedback
xxKeefer
Critically assess code review feedback before applying fixes.
SkillCFreshness: CClaude Code +9 - 0.469score
fix
xxKeefer
Fix a functionally broken behaviour found during manual QA.
SkillCFreshness: CClaude Code +9 - 0.467score
debrief
xxKeefer
Produce a human-readable session debrief and drop it into 00-notes/ in the Obsidian vault.
SkillCFreshness: CClaude Code +9 - 0.466score
setup-tool-policy
xxKeefer
Install the tool-policy PreToolUse hook (runner redirection + command blocking) into a Claude Code settings file.
SkillCFreshness: CClaude Code +9 - 0.445score
domain-modeling
xxKeefer
Build and sharpen a project's domain model.
SkillCFreshness: CClaude Code +9
Signals
- Stars
- 0
- Forks
- 0
- Open issues
- 0
- Last commit (this folder)
- Jun 18, 2026 (4 months ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- License unknown
- Repository
- github.com/xxKeefer/skills
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from xxKeefer
- 0.519score
explain-reasoning
xxKeefer
Explain the reasoning behind decisions, conclusions, or suggestions made in the current conversation.
SkillBFreshness: BClaude Code +9 - 0.469score
to-plan
xxKeefer
Break a task into an executable plan for /implement — or skip planning if the task is simple enough.
SkillCFreshness: CClaude Code +9 - 0.469score
to-tickets-old
xxKeefer
Turn a /spike output into tracker tickets ready for /to-plan or /implement.
SkillCFreshness: CClaude Code +9 - 0.469score
diagnose
xxKeefer
Track down a bug whose root cause is not obvious -- the head-scratchers that need deep code exploration and tracing.
SkillCFreshness: CClaude Code +9 - 0.469score
fix
xxKeefer
Fix a functionally broken behaviour found during manual QA.
SkillCFreshness: CClaude Code +9 - 0.469score
happy-path
xxKeefer
Generate a manual QA test plan for the current changeset.
SkillCFreshness: CClaude Code +9
Done for you
Rather not set it up yourself?
Chalk Labs scopes, builds and runs agents for your team: the task audit, the eval harness, the integrations and the weekly ops report. Fixed scope, priced before we start.
See how we build AI agents →Read the case studies
Chalk Labs is a two-founder AI and growth studio. We build AI agents, CRMs and MVPs for Web3 and AI companies, and have shipped 50+ product and token launches.
- launches shipped
- 50+
- launches shipped
- media placements
- 500+
- media placements
- founders on every account
- 2
- founders on every account
Press we've placed: Forbes · CoinDesk · Decrypt · Cointelegraph · The Block
Rahil Jain, Co-founder, Chalk Labs. Ex-Goldman Sachs engineer. You talk to the person who builds it.
Get resolve-conflicts running in your business
Tell us what you want to automate. A founder replies within one working day with a plan, not a pitch deck.
Cite this page
resolve-conflicts skill. Agent Mart. https://agentmart.dev/skills/xxkeefer-resolve-conflicts (last updated 2026-10-24)