rockcookies/resolving-merge-conflicts
skills/mattpocock/resolving-merge-conflicts/SKILL.md
Use when you need to resolve an in-progress git merge/rebase conflict.
$ install --global
skillsauthnpx skillsauth add rockcookies/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 29, 2026, 3:40 AM272.5s3 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
rockcookies/to-spec
tools
VerifiedTrustedCommunity
Turn the current conversation into a spec and publish it to the project issue tracker — no interview, just synthesis of what you've already discussed.
1SKILL.mdUpdated Jul 25, 2026
rockcookies/teach
tools
VerifiedTrustedCommunity
Teach the user a new skill or concept, within this workspace.
1SKILL.mdUpdated Jul 25, 2026
rockcookies/tdd
development
VerifiedTrustedCommunity
Test-driven development. Use when the user wants to build features or fix bugs test-first, mentions "red-green-refactor", or wants integration tests.
1SKILL.mdUpdated Jul 25, 2026
rockcookies/setup-matt-pocock-skills
documentation
VerifiedTrustedCommunity
Configure this repo for the engineering skills — set up its issue tracker, triage label vocabulary, and domain doc layout. Run once before first use of the other engineering skills.
1SKILL.mdUpdated Jul 25, 2026