resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Skill by clementcaron
Chalk Labs
Need help deploying resolving-merge-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/clementcaron-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 you need to resolve an in-progress git merge/rebase conflict.
- License
- MIT
- Instructions
- 11 lines in SKILL.md · view on GitHub
Files (2)
- SKILL.md
- SKILLS.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 original issues/tickets. 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. **Stop at a clean handoff point.** Once every conflict is resolved and the relevant checks are green, summarise any manual git commands still required to finish the merge or rebase. Leave staging, committing, and rebase continuation to the user unless they explicitly ask you to perform them.
From clementcaron/skills, MIT.
More from clementcaron/skills
- 0.471score
setup-skills
clementcaron
Configure this repo for the engineering skills — set up its durable document layout, temp-artifact policy, and domain doc layout.
SkillCFreshness: CClaude Code +9 - 0.469score
to-prd
clementcaron
Turn the current conversation into a PRD — no interview, just synthesis of what you've already discussed.
SkillCFreshness: CClaude Code +9 - 0.455score
diagnosing-bugs
clementcaron
Diagnosis loop for hard bugs and performance regressions.
SkillCFreshness: CClaude Code +9 - 0.450score
codebase-design
clementcaron
Shared vocabulary for designing deep modules.
SkillCFreshness: CClaude Code +9 - 0.450score
domain-modeling
clementcaron
Build and sharpen a project's domain model.
SkillCFreshness: CClaude Code +9 - 0.444score
to-issues
clementcaron
Break a plan, spec, or PRD into independently-grabbable vertical slices using tracer-bullet slices.
SkillCFreshness: CClaude Code +9 - 0.439score
implement
clementcaron
Implement a piece of work based on a PRD, a slice document, or a single approved slice.
SkillCFreshness: CClaude Code +9 - 0.439score
handoff
clementcaron
Compact the current conversation into a handoff document for another agent to pick up.
SkillCFreshness: CClaude Code +9
Signals
- Stars
- 0
- Forks
- 0
- Open issues
- 0
- Last commit (this folder)
- Jun 17, 2026 (4 months ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- MIT
- Repository
- github.com/clementcaron/skills
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from clementcaron
- 0.471score
setup-skills
clementcaron
Configure this repo for the engineering skills — set up its durable document layout, temp-artifact policy, and domain doc layout.
SkillCFreshness: CClaude Code +9 - 0.469score
to-prd
clementcaron
Turn the current conversation into a PRD — no interview, just synthesis of what you've already discussed.
SkillCFreshness: CClaude Code +9 - 0.455score
diagnosing-bugs
clementcaron
Diagnosis loop for hard bugs and performance regressions.
SkillCFreshness: CClaude Code +9 - 0.450score
codebase-design
clementcaron
Shared vocabulary for designing deep modules.
SkillCFreshness: CClaude Code +9 - 0.450score
domain-modeling
clementcaron
Build and sharpen a project's domain model.
SkillCFreshness: CClaude Code +9 - 0.444score
to-issues
clementcaron
Break a plan, spec, or PRD into independently-grabbable vertical slices using tracer-bullet slices.
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 resolving-merge-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
resolving-merge-conflicts skill. Agent Mart. https://agentmart.dev/skills/clementcaron-resolving-merge-conflicts (last updated 2026-10-24)