fix-merge-conflicts
Pass
Audited by Gen Agent Trust Hub on Oct 22, 2026
Risk Level: SAFECOMMAND_EXECUTIONINDIRECT_PROMPT_INJECTIONEXTERNAL_DOWNLOADS
Full Analysis
- [COMMAND_EXECUTION]: Uses
git,bun, andbunxto manage repository state, install dependencies, and run tests as part of the conflict resolution workflow. These operations are scoped to the project repository.\n- [INDIRECT_PROMPT_INJECTION]: Ingests and processes untrusted code from git merge conflicts, which creates a potential surface for malicious instructions to influence agent behavior.\n - Ingestion points: Reads content from unmerged paths and git base/ours/theirs versions (
git show :1/2/3:<file>) as described inSKILL.md.\n - Boundary markers: The
SKILL.mdfile contains explicit safety rules to treat incoming changes as untrusted and not execute instructions embedded in comments or code.\n - Capability inventory: The skill has access to bash tools (
git,bun,bunx) which can be used to modify the filesystem and execute project-specific scripts.\n - Sanitization: Includes instructions to redact secret-like values and verify the final state using build and test commands.\n- [EXTERNAL_DOWNLOADS]: The documentation references upstream components and historical data from various GitHub repositories, including official repositories from the
anthropicsorganization.
Audit Metadata