resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Skill by sgpopov
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/sgpopov-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
- 10 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 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 sgpopov/ai-kit, MIT.
More from sgpopov/ai-kit
- 0.588score
ai-visibility
sgpopov
Measure and improve whether AI assistants (ChatGPT, Claude, Gemini, Perplexity, Copilot) recommend a brand, and fix the reasons they do not.
SkillAFreshness: A★ 1Claude Code +9 - 0.581score
implement
sgpopov
Implement work from an existing spec or set of tickets, including testing, independent review, and a commit.
SkillAFreshness: A★ 1Claude Code +9 - 0.547score
log-analyzer
sgpopov
Analyzes application, access, and structured logs for errors, trends, anomalies, and operational evidence.
SkillBFreshness: B★ 1Claude Code +9 - 0.527score
code-review
sgpopov
Conducts multi-axis code review.
SkillBFreshness: B★ 1Claude Code +9 - 0.527score
domain-modeling
sgpopov
Build and sharpen a project's domain model.
SkillBFreshness: B★ 1Claude Code +9 - 0.502score
to-spec
sgpopov
Creates a spec through user interview, codebase exploration, and module design, then submit as a GitHub issue or save as a local markdown file.
SkillCFreshness: C★ 1Claude Code +9 - 0.502score
to-tickets
sgpopov
Breaks a PRD into independently-grabbable issues using tracer-bullet vertical slices.
SkillCFreshness: C★ 1Claude Code +9 - 0.502score
git-guardrails-claude-code
sgpopov
Sets up Claude Code hooks to block dangerous git commands (push, reset --hard, clean, branch -D, etc.) before they execute.
SkillCFreshness: C★ 1Claude Code +9 - 0.497score
nestjs-best-practices
sgpopov
Provides NestJS best practices and architecture patterns for production-ready applications and service monorepos.
SkillCFreshness: C★ 1Claude Code +9 - 0.497score
grill-me
sgpopov
Interviews the user relentlessly about a plan or design until reaching shared understanding, resolving each branch of the decision tree.
SkillCFreshness: C★ 1Claude Code +9 - 0.497score
react-best-practices
sgpopov
Provides React and Remix.js performance optimization guidelines.
SkillCFreshness: C★ 1Claude Code +9 - 0.497score
ubiquitous-language
sgpopov
Extracts a DDD-style ubiquitous language glossary from the current conversation, flagging ambiguities and proposing canonical terms.
SkillCFreshness: C★ 1Claude Code +9
Signals
- Stars
- 1
- Forks
- 0
- Open issues
- 0
- Last commit (this folder)
- Aug 13, 2026 (2 months ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- MIT
- Repository
- github.com/sgpopov/ai-kit
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from sgpopov
- 0.588score
ai-visibility
sgpopov
Measure and improve whether AI assistants (ChatGPT, Claude, Gemini, Perplexity, Copilot) recommend a brand, and fix the reasons they do not.
SkillAFreshness: A★ 1Claude Code +9 - 0.581score
implement
sgpopov
Implement work from an existing spec or set of tickets, including testing, independent review, and a commit.
SkillAFreshness: A★ 1Claude Code +9 - 0.547score
log-analyzer
sgpopov
Analyzes application, access, and structured logs for errors, trends, anomalies, and operational evidence.
SkillBFreshness: B★ 1Claude Code +9 - 0.527score
code-review
sgpopov
Conducts multi-axis code review.
SkillBFreshness: B★ 1Claude Code +9 - 0.527score
domain-modeling
sgpopov
Build and sharpen a project's domain model.
SkillBFreshness: B★ 1Claude Code +9 - 0.502score
git-guardrails-claude-code
sgpopov
Sets up Claude Code hooks to block dangerous git commands (push, reset --hard, clean, branch -D, etc.) before they execute.
SkillCFreshness: C★ 1Claude Code +9
Cite this page
resolving-merge-conflicts skill. Agent Mart. https://agentmart.dev/skills/sgpopov-resolving-merge-conflicts (last updated 2026-10-24)