Score
8.5
/ 10
Installs
20K
Repo Stars
144.1K
Last Updated
6d ago
Quality Ratio
93%
Description
Verified
Language
Shell
First Published
Jun 2026
Summary
The Resolving Merge Conflicts agent skill helps developers identify and systematically resolve conflicts that arise during code merges. This agent skill is particularly beneficial for developers and development teams working on projects with frequent changes and multiple contributors, especially those leveraging Git-based version control. It is a skill with 6K installs in the registry, indicating its utility for a significant user base. While specific guidance on its internal patterns, rules, or commands is not detailed in the available documentation, its purpose is to instruct an AI agent on how to methodically approach and suggest resolutions for conflict markers. Developers would likely invoke this skill when faced with typical merge conflict scenarios, expecting the AI to assist in understanding the conflicting changes and proposing appropriate resolutions to the code. It is important to note that without access to the full SKILL.md content, the precise implementation details and advanced usage patterns of this agent skill remain unspecified.
Skill Definition
-
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.