resolving-merge-conflicts
Pass
Audited by Gen Agent Trust Hub on Aug 26, 2026
Risk Level: SAFECOMMAND_EXECUTIONPROMPT_INJECTION
Full Analysis
- [SAFE]: The skill provides high-level procedural instructions for resolving git conflicts. The steps such as checking history, understanding intent, and resolving hunks are standard development practices that do not introduce inherent security risks.
- [COMMAND_EXECUTION]: Step 4 of SKILL.md instructs the agent to discover and run automated checks such as typecheck, tests, and format. This involves executing project-defined commands and scripts within the user's local environment, which is expected behavior for a software engineering skill.
- [PROMPT_INJECTION]: The skill directs the agent to ingest untrusted data from git logs and pull requests. 1. Ingestion points: Git history, commit messages, PR descriptions, and issue trackers are accessed in steps 1 and 2 of SKILL.md. 2. Boundary markers: No specific boundary markers or instructions to ignore embedded commands are present in the prompt template. 3. Capability inventory: The skill utilizes git commands and executes project-defined automated checks (tests, typecheck, format) as noted in steps 4 and 5. 4. Sanitization: There is no evidence of sanitization or validation of the external content before it is processed by the agent. While this creates a surface for indirect prompt injection, the risk is mitigated by the standard nature of the workflow.
Audit Metadata