timschochmattpocock-skills311 installs on skills.shResolving Merge Conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
3 static scans, 0 counted findings.
Edge checks it again each time your agent loads it.
What it does
- Use when you need to resolve an in-progress git merge/rebase conflict.
How it works
- 1Copy
Try for free gives you one prompt.
- 2Paste
Paste it into Claude Code, Codex or Cursor.
- 3Ask
Ask for the outcome. Your agent loads Resolving Merge Conflicts.
3 static scans, 0 counted findings.
Security state at 2026-09-30: reviewed. Static scans check the code, not how well the skill works.
State definitionsSelect the Files tab to load SKILL.md.
Skill details
Security scansReviewed
3 static scans, 0 counted findings. Security state at 2026-09-30: reviewed. Edge checks it again each time your agent loads it.
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. Raw 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. Raw findings: 1.
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. Raw findings: .
- Edge static checks
- Pass · 0 counted findings · 2026-09-27
- Cisco skill-scanner
- Pass · 0 counted findings · 2026-09-27
- Semgrep Edge rules
- Pass · 0 counted findings · 2026-09-27
Creator, source & licencetimschoch
From the timschoch public repository. Edge did not write or edit this skill.
- Repository
- timschoch/mattpocock-skills
- Skill file
- View source at revision
- Revision
- 3a70c00281806c2ca34ad43f5bf9bf67d4fa096d
- Package hash
- sha256:55e3077933f9341d88405fe8427497d48d899f6f98eb6928de454beaff8f8377
- Licence
- MIT
- Description
- Use when you need to resolve an in-progress git merge/rebase conflict.
Quoted from the skill’s own description
Read skill files2 files
2 files, 1.0 KB at revision 3a70c0028180.
Questions about Resolving Merge Conflicts
What does Resolving Merge Conflicts do?
Use when you need to resolve an in-progress git merge/rebase conflict. Published by timschoch (timschoch/mattpocock-skills).
Is Resolving Merge Conflicts safe to use?
Edge security state: Reviewed (3 Edge-run static scans, scanned Sep 30, 2026). The Evidence tab shows the scan.
How do I use Resolving Merge Conflicts in Claude Code, Codex or Cursor?
Click Try for free, pick your agent and follow its one step. Edge is free, with no Edge account.