jssblckagents440 installs on skills.sh

Resolve PR Conflicts

Use when a PR has merge conflicts with its base branch.

Works in any agentClaude CodeCodexCursorClaude appChatGPT+ any other agent
jssblck/agents
Security state: reviewed

3 static scans, 0 counted findings.

Edge checks it again each time your agent loads it.

SKILL.md2 files · 3.4 KB

From the jssblck public repository. Edge did not write or edit this skill.

What it does

  • Use when a PR has merge conflicts with its base branch, including conflicts found during babysitting or merging.

How it works

  1. 1
    Copy

    Try for free gives you one prompt.

  2. 2
    Paste

    Paste it into Claude Code, Codex or Cursor.

  3. 3
    Ask

    Ask for the outcome. Your agent loads Resolve PR Conflicts.

What you can inspect

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 definitions

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 & licencejssblck

From the jssblck public repository. Edge did not write or edit this skill.

Repository
jssblck/agents
Revision
393ae44192c1485a0f919fd327d959049af7c706
Package hash
sha256:341fc7e4d1d2ec5f5963164c90da9a4fcd41b84368c039a591e43bb06c662c87
Licence
GPL-3.0
Description
Use when a PR has merge conflicts with its base branch, including conflicts found during babysitting or merging.
Quoted from the skill’s own description
Read skill files2 files

2 files, 3.4 KB at revision 393ae44192c1.

Questions about Resolve PR Conflicts

What does Resolve PR Conflicts do?

Use when a PR has merge conflicts with its base branch. Published by jssblck (jssblck/agents).

Is Resolve PR 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 Resolve PR 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.