pr-conflict-resolver
Pass
Audited by Gen Agent Trust Hub on Jun 26, 2026
Risk Level: SAFE
Full Analysis
- [SAFE]: No security issues detected. The skill provides clear instructions for safe conflict resolution, emphasizing user confirmation and the use of safe commands like git push --force-with-lease.
- [INDIRECT_PROMPT_INJECTION]: The skill possesses an indirect prompt injection surface because it reads and processes untrusted data from file merge conflicts. This risk is mitigated by explicit instructions to remain conservative, preserve code intent, and consult the user for any semantic or non-mechanical changes. Ingestion points: local files during merge or rebase operations. Boundary markers: standard git conflict markers. Capability inventory: file modification and remote branch updates via git. Sanitization: mandatory user review for all non-obvious conflict resolutions.
Audit Metadata