skillZs
★ LIVE SKILL TAGS ★
>>> LIVE SKILLS INDEX <<<
* OPEN SOURCE *
NO LOGIN, NO TRACKING
※ REAL INSTALL DATA ※
← back to all skills
utarn/engineer-skills74 installs

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/utarn/engineer-skills --skill resolving-merge-conflicts
view source ↗

Is this agent skill safe to install?

  • Gen Agent Trust Hubpass

    This skill provides instructions for resolving git merge and rebase conflicts. It is generally safe but carries a low risk due to its requirement to process external data like PR descriptions and commit messages, which could be used for indirect prompt injection, and its instruction to execute local test suites.

  • Socketpass

    No alerts

  • Snykpass

    Risk: LOW · No issues

What does this agent skill do?

  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.

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/utarn/engineer-skills/resolving-merge-conflicts">View resolving-merge-conflicts on skillZs</a>