resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
How do I install this agent skill?
npx skills add https://github.com/timschoch/mattpocock-skills --skill resolving-merge-conflictsIs this agent skill safe to install?
- Gen Agent Trust Hubpass
The skill is a standard developer tool for resolving git conflicts. It is considered low risk because it instructs the agent to read external content like pull requests and issue descriptions, which could potentially contain indirect prompt injections.
- Socketpass
No alerts
- Snykwarn
Risk: MEDIUM · 1 issue
What does this agent skill do?
-
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.
How can the creator link this skill?
Add the canonical catalog link to the repository README so users can inspect current installs and available audits. The publishing guide covers the complete discovery path.
<a href="https://skillzs.dev/skills/timschoch/mattpocock-skills/resolving-merge-conflicts">View resolving-merge-conflicts on skillZs</a>