resolve-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Skill by yet-an-other
Chalk Labs
Need help deploying resolve-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/yet-an-other-resolve-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/resolve-merge-conflicts
What's inside
- Skill name
resolve-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
Agent Skills spec issues
- name: "resolve-merge-conflicts" does not match folder "resolve-merge-confilct"
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 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. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
From yet-an-other/skills, MIT.
More from yet-an-other/skills
- 0.565score
pubhub-publish
yet-an-other
Publish or share an HTML page, Markdown note, or static site through pubhub when the user explicitly asks to publish or share it.
SkillAFreshness: AClaude Code +9 - 0.558score
explain-me
yet-an-other
Аудит-обзор проекта: суть, архитектура, зависимости, пользовательский путь, качество и проблемы, доки vs код, вердикт.
SkillAFreshness: AClaude Code +9 - 0.539score
code-review
yet-an-other
Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes: Standards (does the code follow this repo's documented coding…
SkillAFreshness: AClaude Code +9 - 0.539score
codebase-design
yet-an-other
Shared vocabulary for designing deep modules.
SkillAFreshness: AClaude Code +9 - 0.539score
grilling
yet-an-other
Grill the user relentlessly about a plan, decision, or idea.
SkillAFreshness: AClaude Code +9 - 0.539score
domain-modeling
yet-an-other
Build and sharpen a project's domain model.
SkillAFreshness: AClaude Code +9 - 0.536score
improve-codebase-architecture
yet-an-other
Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.
SkillAFreshness: AClaude Code +9 - 0.534score
research
yet-an-other
Investigate a question against high-trust primary sources and capture the findings as a Markdown file in the repo.
SkillAFreshness: AClaude Code +9 - 0.524score
commit
yet-an-other
Create well-formatted git commits following conventional commit standards.
SkillBFreshness: BClaude Code +9 - 0.521score
pp-create-event
yet-an-other
Use this skill if user wants to create an event(s) in google calendar out of provided file(s) or text description.
SkillBFreshness: BClaude Code +9 - 0.499score
prototype
yet-an-other
Build a throwaway prototype to answer a design question.
SkillBFreshness: BClaude Code +9 - 0.488score
implement
yet-an-other
Implement a piece of work based on a spec or set of tickets.
SkillBFreshness: BClaude Code +9
Signals
- Stars
- 0
- Forks
- 0
- Open issues
- 0
- Last commit (this folder)
- Sep 10, 2026 (1 month ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- MIT
- Repository
- github.com/yet-an-other/skills
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from yet-an-other
- 0.565score
pubhub-publish
yet-an-other
Publish or share an HTML page, Markdown note, or static site through pubhub when the user explicitly asks to publish or share it.
SkillAFreshness: AClaude Code +9 - 0.558score
explain-me
yet-an-other
Аудит-обзор проекта: суть, архитектура, зависимости, пользовательский путь, качество и проблемы, доки vs код, вердикт.
SkillAFreshness: AClaude Code +9 - 0.539score
code-review
yet-an-other
Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes: Standards (does the code follow this repo's documented coding…
SkillAFreshness: AClaude Code +9 - 0.539score
codebase-design
yet-an-other
Shared vocabulary for designing deep modules.
SkillAFreshness: AClaude Code +9 - 0.539score
grilling
yet-an-other
Grill the user relentlessly about a plan, decision, or idea.
SkillAFreshness: AClaude Code +9 - 0.539score
domain-modeling
yet-an-other
Build and sharpen a project's domain model.
SkillAFreshness: AClaude 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-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
resolve-merge-conflicts skill. Agent Mart. https://agentmart.dev/skills/yet-an-other-resolve-merge-conflicts (last updated 2026-10-24)