resolving-merge-conflicts
Resolve an in-progress git merge/rebase conflict hunk by hunk, by intent.
Skill by engty
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/engty-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
- Resolve an in-progress git merge/rebase conflict hunk by hunk, by intent. Use when the user reports a merge or rebase conflict, or says "解决冲突" / "合并冲突".
- License
- NOASSERTION
- Instructions
- 15 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 engty/dsh-mattpocock-skills
- 0.516score
ask
engty
所有任务的统一入口（一键开始包）。用户输入 /ask 开始：先问清要做什么，给出路线，然后一步一步编排本技能包完成整个任务；/ask 后面可以直接跟需求或问题。User-invoked：type /ask，可后跟一句任务描述。中文触发：ask、开始、帮我做。
SkillBFreshness: BClaude Code +9 - 0.499score
diagnosing-bugs
engty
Diagnosis loop for hard bugs and performance regressions.
SkillBFreshness: BClaude Code +9 - 0.494score
grilling
engty
Grill the user relentlessly about a plan, decision, or idea.
SkillBFreshness: BClaude Code +9 - 0.494score
prototype
engty
Build a throwaway prototype to answer a design question.
SkillBFreshness: BClaude Code +9 - 0.494score
domain-modeling
engty
Build and sharpen a project's domain model.
SkillBFreshness: BClaude Code +9 - 0.494score
code-review
engty
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…
SkillBFreshness: BClaude Code +9 - 0.494score
codebase-design
engty
Shared vocabulary for designing deep modules.
SkillBFreshness: BClaude Code +9 - 0.494score
tdd
engty
Test-driven development.
SkillBFreshness: BClaude Code +9 - 0.491score
improve-codebase-architecture
engty
Scan a codebase for deepening opportunities, present them as an interactive report, then grill through whichever one you pick.
SkillBFreshness: BClaude Code +9 - 0.491score
teach
engty
Teach the user a new skill or concept over multiple sessions, within this workspace.
SkillBFreshness: BClaude Code +9 - 0.491score
to-questionnaire
engty
Turn a decision you can't fully answer into a questionnaire for someone else to fill in.
SkillBFreshness: BClaude Code +9 - 0.491score
to-spec
engty
Turn the current conversation into a spec and publish it to the project issue tracker: no interview, just synthesis of what you've already discussed.
SkillBFreshness: BClaude Code +9
Signals
- Stars
- 0
- Forks
- 0
- Open issues
- 0
- Last commit (this folder)
- Sep 19, 2026 (1 month ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- NOASSERTION
- Repository
- github.com/engty/dsh-mattpocock-skills
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from engty
- 0.516score
ask
engty
所有任务的统一入口（一键开始包）。用户输入 /ask 开始：先问清要做什么，给出路线，然后一步一步编排本技能包完成整个任务；/ask 后面可以直接跟需求或问题。User-invoked：type /ask，可后跟一句任务描述。中文触发：ask、开始、帮我做。
SkillBFreshness: BClaude Code +9 - 0.499score
diagnosing-bugs
engty
Diagnosis loop for hard bugs and performance regressions.
SkillBFreshness: BClaude Code +9 - 0.494score
domain-modeling
engty
Build and sharpen a project's domain model.
SkillBFreshness: BClaude Code +9 - 0.494score
grilling
engty
Grill the user relentlessly about a plan, decision, or idea.
SkillBFreshness: BClaude Code +9 - 0.494score
code-review
engty
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…
SkillBFreshness: BClaude Code +9 - 0.494score
codebase-design
engty
Shared vocabulary for designing deep modules.
SkillBFreshness: BClaude Code +9
Cite this page
resolving-merge-conflicts skill. Agent Mart. https://agentmart.dev/skills/engty-resolving-merge-conflicts (last updated 2026-10-24)