resolving-merge-conflicts
Pass
Audited by Gen Agent Trust Hub on Jul 24, 2026
Risk Level: SAFEPROMPT_INJECTION
Full Analysis
- [SAFE]: The skill instructions define a legitimate developer workflow for git conflict resolution. It directs the agent to understand original intent through history and documentation and strictly forbids inventing new behavior or bypassing checks.- [PROMPT_INJECTION]: The skill possesses an indirect prompt injection surface because it reads untrusted data from git conflicts, pull request descriptions, and issue trackers. This is a functional requirement for conflict resolution. The risk is mitigated by explicit instructions to preserve intent and verify changes through automated checks.
- Ingestion points: Conflict hunks, git history, PR descriptions, and issue/ticket content (SKILL.md).
- Boundary markers: None.
- Capability inventory: Execution of git commands and project-defined automated checks such as tests and formatters (SKILL.md).
- Sanitization: Relies on the project's existing automated validation suite.
Audit Metadata