FrancoStino/resolving-merge-conflicts
bundled-skills/resolving-merge-conflicts/SKILL.md
Use when you need to resolve an in-progress git merge/rebase conflict.
$ install --global
skillsauthnpx skillsauth add FrancoStino/opencode-skills-antigravity 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 9, 2026, 3:10 AM93.8s1 file scanned
SKILL.md
- name:
- resolving-merge-conflicts
- description:
- Use when you need to resolve an in-progress git merge/rebase conflict.
- risk:
- unknown
- source:
- https://github.com/mattpocock/skills/tree/main/skills/engineering/resolving-merge-conflicts
- source_repo:
- mattpocock/skills
- source_type:
- community
- date_added:
- 2026-07-01
- license:
- MIT
- license_source:
- https://github.com/mattpocock/skills/blob/main/LICENSE
When to Use
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.
Limitations
- Use this skill only when the task clearly matches its upstream source and local project context.
- Verify commands, generated code, dependencies, credentials, and external service behavior before applying changes.
- Do not treat examples as a substitute for environment-specific tests, security review, or user approval for destructive or costly actions.
Related Skills
FrancoStino/seo-drift
data-ai
VerifiedTrustedCommunity
Snapshot a site's SEO state and detect ranking, indexation, metadata, canonical, robots, schema, and on-page regressions over time.
57SKILL.mdUpdated Jul 27, 2026
FrancoStino/orchestrate
development
VerifiedTrustedCommunity
Coordinate focused subagents on substantial work, keep their ownership non-overlapping, and integrate verified results. Use for large-scope Codex tasks; keep trivial work with the coordinator.
57SKILL.mdUpdated Jul 27, 2026
FrancoStino/find-complementary-founders
data-ai
VerifiedTrustedCommunity
Use when an owner asks to find a cofounder or project partner. Assess only that agent's own owner and rank only approved profiles other agents posted for their own owners.
57SKILL.mdUpdated Jul 27, 2026
FrancoStino/fedora-hyprland-installer
devops
VerifiedTrustedCommunity
Install, configure, verify, repair, update, and uninstall Hyprland on Fedora Linux with GPU-aware detection (NVIDIA/AMD/Intel).
57SKILL.mdUpdated Jul 27, 2026