Resolving Merge Conflicts

by tt-a1i

Resolving Merge Conflicts is a DevOps skill for Claude Code, published by tt-a1i in matt-skills-with-to-goal.

14 stars3 forkson tt-a1i/matt-skills-with-to-goalAdded 2026/07/16+17% in starsRepository updated 2026/07/16

View source on GitHub Download repo ZIP

agent-skillsai-agentsclaude-codecodexcoding-agentsdeveloper-toolsworkflow

Install in seconds

Install Resolving Merge Conflicts

Copy Resolving Merge Conflicts into your Claude Code skills folder. Run the command in your terminal, or review the source on GitHub before installing.

terminal

npx degit https://github.com/tt-a1i/matt-skills-with-to-goal/tree/main/skills/resolving-merge-conflicts ~/.claude/skills/resolving-merge-conflicts

Requires Node.js. Downloads this skill only — not the rest of the repository — into your Claude Code skills folder.

Without Node.js

git clone https://github.com/tt-a1i/matt-skills-with-to-goal.git

Clones the whole repository, then copy the skill’s own directory into your skills folder yourself.

In this catalog

Source file: skills/resolving-merge-conflicts/SKILL.md in tt-a1i/matt-skills-with-to-goal
Installs to: ~/.claude/skills/resolving-merge-conflicts
Collection: One of 40 skills cataloged from this repository
Category: DevOps — 1075 skills

What Resolving Merge Conflicts does

Resolves in-progress git merge or rebase conflicts by identifying primary sources, preserving intent, and running automated checks. Use when you need to finish a merge or rebase without aborting.

Resolving Merge Conflicts is cataloged under DevOps on DirSkills. Resolving Merge Conflicts comes from a repository tagged agent-skills, ai-agents, claude-code, codex and coding-agents.

Documentation

README

From the original repository

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. Always resolve; never --abort.
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.

Frequently asked about Resolving Merge Conflicts

What else does tt-a1i publish alongside Resolving Merge Conflicts?
Resolving Merge Conflicts is one of 40 skills that DirSkills catalogs from tt-a1i/matt-skills-with-to-goal, the repository it ships in. Its siblings there include Agent Handoff, Ask Matt and Ask Matt. Each one is a separate skill with its own page in this directory, installs the same way Resolving Merge Conflicts does, and is maintained by tt-a1i in that same repository. The rest of the collection is listed on the tt-a1i/matt-skills-with-to-goal page.
How does Resolving Merge Conflicts compare to other DevOps skills?
Resolving Merge Conflicts ranks #1069 by stars among the 1075 DevOps skills in this catalog. The most-starred ones next to it are Backend Patterns, API Connector Builder and Migration. DirSkills ranks by the star count of the repository each skill ships in, so that order reflects how popular those repositories are rather than any review of Resolving Merge Conflicts against them. Open each page to compare what they document and how they install.