resolving-merge-conflicts
Resolve a real Git merge or rebase conflict by preserving the intended behavior from both sides.
Skill by maheen-ejaz
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/maheen-ejaz-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 a real Git merge or rebase conflict by preserving the intended behavior from both sides. Invoke explicitly with Pi's `/skill:<name>` syntax.
- License
- MIT
- Instructions
- 13 lines in SKILL.md · view on GitHub
Files (1)
- SKILL.md
SKILL.md (first lines)
# Resolving merge conflicts Use only after Git reports a real merge or rebase conflict. Infer whether the current workflow still intends to continue; ask only when that intent is unclear. Trace each side to its ticket, commit, pull request, tests, and current behavior rather than choosing text mechanically. This skill authorizes only the smallest compatible resolution and affected checks; it does not authorize publication or merge. Finish with a conflict-free index, an inspected diff, and fresh affected-check evidence, then return control to the same workflow state.
From maheen-ejaz/pi-agent-config, MIT.
More from maheen-ejaz/pi-agent-config
- 0.529score
bb-cli
maheen-ejaz
Use this when controlling bb.
SkillBFreshness: BClaude Code +9 - 0.526score
repo-audit
maheen-ejaz
Run an explicit user-invoked repository audit in daily, weekly, or report mode against any repository.
SkillBFreshness: BClaude Code +9 - 0.524score
tdd
maheen-ejaz
Run strict test-driven development only when the user explicitly invokes the skill using Pi's `/skill:tdd` syntax.
SkillBFreshness: BClaude Code +9 - 0.521score
i-have-adhd
maheen-ejaz
Shape output for a reader with ADHD: lead with the next action, number multi-step work, restate state across turns, suppress tangents, give specific time…
SkillBFreshness: BClaude Code +9 - 0.521score
infisical-credential-access
maheen-ejaz
Automatically govern credential-backed work through repository-declared Infisical runners.
SkillBFreshness: BClaude Code +9 - 0.521score
linear-ticket-delivery
maheen-ejaz
Deliver one explicitly identified Linear ticket through implementation, merge, release, and production validation.
SkillBFreshness: BClaude Code +9 - 0.521score
worktree-retire
maheen-ejaz
Inventory Git worktrees and guide explicit, safe retirement of one verified worktree.
SkillBFreshness: BClaude Code +9 - 0.521score
linear-ticket-operations
maheen-ejaz
Automatically standardize every Linear issue read, search, create, edit, comment, metadata, relation, archive, unarchive, or delete operation with…
SkillBFreshness: BClaude Code +9 - 0.521score
main-sync
maheen-ejaz
Inspect and safely align one Git repository's canonical main checkout with its fetched origin default branch.
SkillBFreshness: BClaude Code +9 - 0.516score
wayfinder
maheen-ejaz
Create a bounded decision map for a huge, foggy effort without starting implementation.
SkillBFreshness: BClaude Code +9 - 0.516score
writing-for-agents
maheen-ejaz
Write concise agent-facing instructions with clear triggers, ownership, and completion criteria.
SkillBFreshness: BClaude Code +9 - 0.516score
grilling
maheen-ejaz
Resolve a material product or implementation decision through a one-question-at-a-time interview.
SkillBFreshness: BClaude Code +9
Signals
- Stars
- 0
- Forks
- 0
- Open issues
- 0
- Last commit (this folder)
- Sep 23, 2026 (1 month ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- MIT
- Repository
- github.com/maheen-ejaz/pi-agent-config
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from maheen-ejaz
- 0.529score
bb-cli
maheen-ejaz
Use this when controlling bb.
SkillBFreshness: BClaude Code +9 - 0.526score
repo-audit
maheen-ejaz
Run an explicit user-invoked repository audit in daily, weekly, or report mode against any repository.
SkillBFreshness: BClaude Code +9 - 0.524score
tdd
maheen-ejaz
Run strict test-driven development only when the user explicitly invokes the skill using Pi's `/skill:tdd` syntax.
SkillBFreshness: BClaude Code +9 - 0.521score
main-sync
maheen-ejaz
Inspect and safely align one Git repository's canonical main checkout with its fetched origin default branch.
SkillBFreshness: BClaude Code +9 - 0.521score
i-have-adhd
maheen-ejaz
Shape output for a reader with ADHD: lead with the next action, number multi-step work, restate state across turns, suppress tangents, give specific time…
SkillBFreshness: BClaude Code +9 - 0.521score
linear-ticket-operations
maheen-ejaz
Automatically standardize every Linear issue read, search, create, edit, comment, metadata, relation, archive, unarchive, or delete operation with…
SkillBFreshness: BClaude 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/maheen-ejaz-resolving-merge-conflicts (last updated 2026-10-24)