resolve-pr-conflicts
Use when a PR has merge conflicts with its base branch.
What this skill does for you
Use when a PR has merge conflicts with its base branch, including conflicts found during babysitting or merging.
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 resolve-pr-conflicts skill from jssblck/agents.
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: 393ae44192c1485a0f919fd327d959049af7c706. 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: 393ae44192c1485a0f919fd327d959049af7c706. 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: 393ae44192c1485a0f919fd327d959049af7c706. Raw findings: . Counted findings: .
Source and licence
- Repository
- https://github.com/jssblck/agents
- Pinned skill file
- View source at revision
- Revision
- 393ae44192c1485a0f919fd327d959049af7c706
- Package hash
- sha256:341fc7e4d1d2ec5f5963164c90da9a4fcd41b84368c039a591e43bb06c662c87
- Licence
- GPL-3.0