resolve-git-conflicts
Pass
Audited by Gen Agent Trust Hub on May 11, 2026
Risk Level: SAFEPROMPT_INJECTIONCOMMAND_EXECUTION
Full Analysis
- [PROMPT_INJECTION]: The skill defines a process for reading and editing files containing Git conflict markers, which constitutes an ingestion point for untrusted data.\n
- Ingestion points: The agent reads the contents of conflicting files in the repository to identify and resolve markers (SKILL.md).\n
- Boundary markers: The skill relies on standard Git conflict markers (<<<<<<<, =======, >>>>>>>) which provide structure but do not prevent the agent from following instructions embedded within those blocks (SKILL.md).\n
- Capability inventory: The skill utilizes the Bash tool to execute Git commands and language-specific testing scripts (SKILL.md).\n
- Sanitization: No sanitization or validation of the conflicting content is performed before the agent processes it for resolution.\n- [COMMAND_EXECUTION]: The skill instructs the agent to execute standard Git repository management commands (e.g., git status, git checkout, git add) and language-specific test suites (e.g., npm test, cargo test). These commands are used according to their intended purpose for conflict resolution.
Audit Metadata