tk-merge-conflict
Pass
Audited by Gen Agent Trust Hub on Aug 25, 2026
Risk Level: SAFECOMMAND_EXECUTION
Full Analysis
- [COMMAND_EXECUTION]: The skill executes standard Git commands (such as
git status,git add, andgit merge --continue) and project-specific verification tests. These actions are limited by a strict command contract that requires verifiable evidence and specific completion signals before the agent can proceed to the next step. - [INDIRECT_PROMPT_INJECTION]:
- Ingestion points: The skill processes untrusted data contained within Git conflict hunks and unmerged source files during active repository operations.
- Boundary markers: The instructions mandate identifying standard Git conflict markers (
<<<<<<<,=======,>>>>>>>) to isolate and manage conflicting content. - Capability inventory: The skill is capable of modifying the local file system, staging files to the Git index, and executing external verification scripts (tests/builds) to confirm resolution integrity.
- Sanitization: Security risk is mitigated by a mandatory verification phase where the agent must run static checks or tests and verify the absence of remaining markers and unmerged entries before finalizing the operation.
Audit Metadata