git-conflict-resolve
Pass
Audited by Gen Agent Trust Hub on Nov 5, 2026
Risk Level: SAFEINDIRECT_PROMPT_INJECTION
Full Analysis
- [INDIRECT_PROMPT_INJECTION]: The skill processes untrusted code content during conflict resolution (e.g., reading conflict markers and merging changes). This presents a standard attack surface where malicious instructions could be embedded in the code being resolved.
- Ingestion points: Conflict detection via
git diff,git status, and reading file contents with conflict markers inStep 3. - Boundary markers: The instructions explicitly direct the agent to identify and process standard Git conflict markers (
<<<<<<< HEAD,=======,>>>>>>>). - Capability inventory: Shell command execution for Git operations (
git checkout,git add,git status), directory creation, and file writes to/tmpfor backups and reports. - Sanitization: The skill focuses on structural resolution of code but does not include explicit sanitization to filter out prompt injection attacks that might be present in the conflicted code blocks.
Audit Metadata