pocock-resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Skill by nseng-ai
Chalk Labs
Need help deploying pocock-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/nseng-ai-pocock-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/pocock-resolving-merge-conflicts
What's inside
- Skill name
pocock-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
- openai.yaml · agents/
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 nseng-ai/ns, MIT.
More from nseng-ai/ns
- 0.557score
branch-context-impl
nseng-ai
Use when a user explicitly wants to implement from an attached branch-context plan on the current branch — "implement the branch context", "load the attached…
SkillBFreshness: B★ 2Claude Code +9 - 0.553score
branch-context-from-plan
nseng-ai
Use when a user explicitly wants to create an implementation branch from a saved plan and attach its branch context as a named Markdown key — "from plan"…
SkillBFreshness: B★ 2Claude Code +9 - 0.537score
diagnosing-bugs
nseng-ai
Diagnosis loop for hard bugs and performance regressions.
SkillBFreshness: B★ 2Claude Code +9 - 0.532score
codebase-design
nseng-ai
Shared vocabulary for designing deep modules.
SkillBFreshness: B★ 2Claude Code +9 - 0.532score
domain-modeling
nseng-ai
Build and sharpen a project's domain model.
SkillBFreshness: B★ 2Claude Code +9 - 0.532score
pocock-review
nseng-ai
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: B★ 2Claude Code +9 - 0.531score
writing-for-agents
nseng-ai
Writing documents for agents.
SkillBFreshness: B★ 2Claude Code +9 - 0.529score
wayfinder
nseng-ai
Plan a huge chunk of work — more than one agent session can hold — as a shared map of decision tickets on your issue tracker, and resolve them one at a time…
SkillBFreshness: B★ 2Claude Code +9 - 0.529score
improve-codebase-architecture
nseng-ai
Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.
SkillBFreshness: B★ 2Claude Code +9 - 0.527score
grilling
nseng-ai
Grill the user relentlessly about a plan, decision, or idea.
SkillBFreshness: B★ 2Claude Code +9 - 0.507score
fdt-refactor-mock-to-fake
nseng-ai
Refactor tests that use unittest.mock.patch or MagicMock into erk's gateway-based fake pattern.
SkillCFreshness: C★ 2Claude Code +9
Signals
- Stars
- 2
- Forks
- 0
- Open issues
- 4
- Last commit (this folder)
- Jul 8, 2026 (3 months ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- MIT
- Repository
- github.com/nseng-ai/ns
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from nseng-ai
- 0.557score
branch-context-impl
nseng-ai
Use when a user explicitly wants to implement from an attached branch-context plan on the current branch — "implement the branch context", "load the attached…
SkillBFreshness: B★ 2Claude Code +9 - 0.553score
branch-context-from-plan
nseng-ai
Use when a user explicitly wants to create an implementation branch from a saved plan and attach its branch context as a named Markdown key — "from plan"…
SkillBFreshness: B★ 2Claude Code +9 - 0.537score
diagnosing-bugs
nseng-ai
Diagnosis loop for hard bugs and performance regressions.
SkillBFreshness: B★ 2Claude Code +9 - 0.532score
codebase-design
nseng-ai
Shared vocabulary for designing deep modules.
SkillBFreshness: B★ 2Claude Code +9 - 0.532score
domain-modeling
nseng-ai
Build and sharpen a project's domain model.
SkillBFreshness: B★ 2Claude Code +9 - 0.532score
pocock-review
nseng-ai
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: B★ 2Claude 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 pocock-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
pocock-resolving-merge-conflicts skill. Agent Mart. https://agentmart.dev/skills/nseng-ai-pocock-resolving-merge-conflicts (last updated 2026-10-24)