resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
What this skill does for you
Use when you need to resolve an in-progress git merge/rebase conflict.
Quoted from the skill description in the pinned sourceWho made it
Use it with Edge
Set up Edge for me: read getedge.cc/SKILL.md and follow it. Then use Edge to load the resolving-merge-conflicts skill from timschoch/mattpocock-skills.
Paste it into Claude, ChatGPT, Codex or Cursor.
Or read the skill source first.
Security evidence
| Scanner | Date | Result | Findings |
|---|---|---|---|
| Edge static checks | 2026-09-27 | Pass | 0 |
| Cisco skill-scanner | 2026-09-27 | Pass | 0 |
| Semgrep Edge rules | 2026-09-27 | Pass | 0 |
Static scans check the code, not how well the skill works.
Scanner scope, raw findings and mirrored provider records
Edge static checks (Edge-run): edge-static/1.0.1. Scope: Static patterns for remote execution, credentials with network sends, obfuscation, prompt overrides, hidden Unicode, binaries and persistence. Revision: 3a70c00281806c2ca34ad43f5bf9bf67d4fa096d. Raw findings: . Counted findings: .
Cisco skill-scanner (Edge-run): cisco-skill-scanner/2.1.0. Scope: Local static, YARA, pipeline and behavioral analyzers; no LLM or AI Defense analysis. Revision: 3a70c00281806c2ca34ad43f5bf9bf67d4fa096d. Raw findings: 1. Counted findings: .
Semgrep Edge rules (Edge-run): semgrep/1.178.0+edge-rules.c15016a36fd3+offline-v1. Scope: Six Edge-authored static rules with Semgrep CE; offline execution and metrics disabled. Semgrep-maintained rules excluded. Revision: 3a70c00281806c2ca34ad43f5bf9bf67d4fa096d. Raw findings: . Counted findings: .
Source and licence
- Repository
- https://github.com/timschoch/mattpocock-skills
- Pinned skill file
- View source at revision
- Revision
- 3a70c00281806c2ca34ad43f5bf9bf67d4fa096d
- Package hash
- sha256:55e3077933f9341d88405fe8427497d48d899f6f98eb6928de454beaff8f8377
- Licence
- MIT