resolving-merge-conflicts

Q: How do I install resolving-merge-conflicts?

Run npx skills add https://github.com/tt-a1i/matt-skills-with-to-goal --skill resolving-merge-conflicts in your project. The skills CLI detects the agents you use and copies the skill into the right folder. For Claude Code you can also place the skill folder at ~/.claude/skills/resolving-merge-conflicts/ (personal) or .claude/skills/resolving-merge-conflicts/ (project).

by tt-a1iCode Quality & Workflow

Use when you need to resolve an in-progress git merge/rebase conflict.

Installs: 129
Last 24h: —
Trending rank: —
Security: Not audited

Install

Works with every agent the skills CLI supports.

npx skills add https://github.com/tt-a1i/matt-skills-with-to-goal --skill resolving-merge-conflicts

01
Install
Run the command in your project. The CLI asks which agents to install for.
02
Describe the task
Ask your agent for something this skill covers. It loads resolving-merge-conflicts automatically when relevant.
03
Review the result
The agent follows the SKILL.md steps, scripts and references bundled with the skill.

SKILL.md

The instructions your agent reads when the skill is triggered.

See the current state of the merge/rebase. Check git history, and the conflicting files.
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.
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. Default to resolving; reach for --abort only when the two intents are irreconcilable and the right fix is restructuring the change.
Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

FAQ

What does the resolving-merge-conflicts skill do?

Use when you need to resolve an in-progress git merge/rebase conflict.

How do I install resolving-merge-conflicts?

Run npx skills add https://github.com/tt-a1i/matt-skills-with-to-goal --skill resolving-merge-conflicts in your project. The skills CLI detects the agents you use and copies the skill into the right folder. For Claude Code you can also place the skill folder at ~/.claude/skills/resolving-merge-conflicts/ (personal) or .claude/skills/resolving-merge-conflicts/ (project).

Which AI agents can use resolving-merge-conflicts?

Any agent that supports the open Agent Skills format (a folder with a SKILL.md file), including Claude Code, Codex, Cursor, GitHub Copilot, Gemini CLI, Windsurf, Cline, OpenCode and more.

Is resolving-merge-conflicts safe to install?

No partner security audit is available yet. Skills can run commands and scripts, so read the SKILL.md and any bundled files before installing.

Who maintains resolving-merge-conflicts?

It is published by tt-a1i in tt-a1i/matt-skills-with-to-goal. It has 129 recorded installs.