branch-resolve-conflicts

Use when a git merge or rebase hits complex conflicts, or the user says "resolve conflicts" / "fix merge conflicts".

IndexedMIT★ 2

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/risadams-branch-resolve-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

Use when a git merge or rebase hits complex conflicts, or the user says "resolve conflicts" / "fix merge conflicts". Reconstructs intent, preserves both branches' goals when possible, and runs automated checks.

Reviews

Write a review

No 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/branch-resolve-conflicts

What's inside

Skill name: branch-resolve-conflicts
Description: Use when a git merge or rebase hits complex conflicts, or the user says "resolve conflicts" / "fix merge conflicts". Reconstructs intent, preserves both branches' goals when possible, and runs automated checks.
License: MIT
Compatibility: claude-code codex opencode
Instructions: 25 lines in SKILL.md · view on GitHub

Agent Skills spec issues

allowed-tools: must be a space-separated string

Files (4)

README.md
SKILL.md
openai.yaml · agents/
examples.md

SKILL.md (first lines)

## Workflow

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.
---

## See also

- **[README](README.md)** — Full guide with examples and best practices
- **[examples.md](examples.md)** — Annotated conflict resolution walkthroughs

> **Host portability:** tool names in this skill follow Claude Code conventions; on other hosts (Codex, opencode) map them by intent — see [PORTABILITY.md](../PORTABILITY.md).

<!-- self-evolve:start -->
## Self-Evolve Loop
Journal `~/.ink-and-agency/learnings/branch-resolve-conflicts.md` (or workspace-local `.ink-and-agency/` where the sandbox confines writes). Read it first; append what the run taught — [SELF-EVOLVE.md](../SELF-EVOLVE.md).
<!-- self-evolve:end -->

From risadams/ink-and-agency, MIT.

Signals

Stars: 2
Forks: 0
Open issues: 0
Last commit (this folder): Sep 23, 2026 (1 month ago)
Last release: Sep 23, 2026 (1 month ago)

From GitHub (fetched Oct 24, 2026).

Details

License: MIT
Repository: github.com/risadams/ink-and-agency
First seen: Oct 24, 2026
Last checked: Oct 24, 2026
Source: GitHub github-graphql

More from risadams

Cite this page

branch-resolve-conflicts skill. Agent Mart. https://agentmart.dev/skills/risadams-branch-resolve-conflicts (last updated 2026-10-24)