resolving-merge-conflicts
Pass
Audited by Gen Agent Trust Hub on Aug 9, 2026
Risk Level: SAFEPROMPT_INJECTIONCOMMAND_EXECUTION
Full Analysis
- [PROMPT_INJECTION]: The skill handles untrusted data by reading Git blobs and conflict hunks, which presents an attack surface for indirect prompt injection where malicious code could attempt to influence the agent's resolution decisions.
- Ingestion points: Git index entries and stage blobs referenced in 'SKILL.md'.
- Boundary markers: The skill does not implement specific delimiters or 'ignore' instructions for the content of the files being merged.
- Capability inventory: Authorized file writes to conflicted paths and execution of repository tests.
- Sanitization: Relies on logic for tracing intent rather than technical content sanitization.- [COMMAND_EXECUTION]: The agent is instructed to execute local command-line tools for Git operations and project validation.
- Evidence: Use of 'git status', 'git ls-files -u', and 'git diff --cc' for state discovery.
- Evidence: Instructions to 'run the narrowest checks that exercise each preserved behavior' including typechecks and formatting tools during the validation phase.
Audit Metadata