resolving-merge-conflicts
Pass
Audited by Gen Agent Trust Hub on Jul 23, 2026
Risk Level: SAFE
Full Analysis
- [INDIRECT_PROMPT_INJECTION]: The skill instructs the agent to read external metadata, which is a potential surface for indirect prompt injection.
- Ingestion points: Commit messages, pull request content, and issue/ticket descriptions are ingested to understand the intent of conflicting changes.
- Boundary markers: No specific delimiters or instructions to ignore embedded commands within the retrieved data are provided.
- Capability inventory: The skill allows file modification (resolving conflicts) and command execution (running tests and formatters via shell).
- Sanitization: No explicit sanitization of external text is performed before it is processed by the agent.
- [COMMAND_EXECUTION]: The skill requires the agent to run project-specific automated checks.
- Evidence: Step 4: "Discover the project's automated checks and run them — typically typecheck, then tests, then format."
Audit Metadata