mattpocock/resolving-merge-conflicts
skills/engineering/resolving-merge-conflicts/SKILL.md
Use when you need to resolve an in-progress git merge/rebase conflict.
$ install --global
skillsauthnpx skillsauth add mattpocock/skills resolving-merge-conflictsInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Jul 14, 2026, 7:07 AM157.8s2 files scanned
SKILL.md
- name:
- resolving-merge-conflicts
- description:
- Use when you need to resolve an in-progress git merge/rebase conflict.
-
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.
Related Skills
mattpocock/batch-grill-me
tools
VerifiedTrustedCommunity
A relentless interview that asks every frontier question at once, round by round.
180,917SKILL.mdUpdated Jul 22, 2026
mattpocock/to-tickets
tools
VerifiedTrustedCommunity
Break a plan, spec, or the current conversation into a set of tracer-bullet tickets, each declaring its blocking edges, published to the configured tracker — edges as text in one file per ticket locally, or native blocking links on a real tracker.
180,917SKILL.mdUpdated Jul 9, 2026
mattpocock/to-questionnaire
testing
VerifiedTrustedCommunity
Turn a decision you can't fully answer into a questionnaire for someone else to fill in.
170,916SKILL.mdUpdated Jul 15, 2026
mattpocock/setup-ts-deep-modules
development
VerifiedTrustedCommunity
Wire dependency-cruiser into a TypeScript repo so each package is a deep module — implementation hidden in subfolders, reachable only through its entry-point files. User-invoked.
168,867SKILL.mdUpdated Jul 11, 2026