fix-merge-conflicts
Pass
Audited by Gen Agent Trust Hub on Aug 19, 2026
Risk Level: SAFECOMMAND_EXECUTION
Full Analysis
- [SAFE]: The skill's workflow is consistent with its stated purpose of resolving merge conflicts. No indicators of prompt injection, data exfiltration, or obfuscation were found.
- [COMMAND_EXECUTION]: The skill uses package manager tools and build/test scripts to verify code integrity after resolving conflicts. These operations are standard for development environments and are restricted to the local repository context.
- [INDIRECT_PROMPT_INJECTION]: The skill processes external content (merge conflicts in code). While this presents a theoretical surface for indirect prompt injection, the risk is minimal as the agent is instructed to focus on correctness-first edits and validation through compilation.
- Ingestion points: Reads conflicting files via git status and file content analysis.
- Boundary markers: Standard agent-level markers apply; no specific markers defined in instructions.
- Capability inventory: Can modify local files and execute build/test commands via the shell.
- Sanitization: Relies on the build/test validation step to ensure code integrity.
Audit Metadata