resolve-conflicts
Pass
Audited by Gen Agent Trust Hub on May 20, 2026
Risk Level: SAFECOMMAND_EXECUTIONPROMPT_INJECTION
Full Analysis
- [COMMAND_EXECUTION]: The skill executes a variety of standard Git and shell commands to manage repository states, including
git fetch,git diff,git checkout,git add, andgit commit. These operations are consistent with the skill's purpose of resolving merge and rebase conflicts. - [PROMPT_INJECTION]: The skill is susceptible to indirect prompt injection because it reads and analyzes content from the user's repository which could contain adversarial instructions.
- Ingestion points: The skill reads untrusted data from files using commands like
git show :2:<file>,git show :3:<file>, andgit diff <file>to extract version differences for the AI to analyze. - Boundary markers: There are no explicit markers or instructions to the AI to ignore instructions found within the diffs or file content being resolved.
- Capability inventory: The skill possesses the capability to modify the local filesystem and repository state through commands like
git add,git checkout, andgit commitbased on the AI's analysis. - Sanitization: The skill does not perform any sanitization or filtering of the code content before presenting it to the agent for analysis.
Audit Metadata