resolving-merge-conflicts
Pass
Audited by Gen Agent Trust Hub on Jul 20, 2026
Risk Level: SAFE
Full Analysis
- [SAFE]: The skill provides high-level workflow instructions for resolving git conflicts. It contains no executable scripts, shell commands, or network operations.
- [PROMPT_INJECTION]: The instructions direct the agent to analyze external, untrusted content such as git history, commit messages, and PR descriptions (SKILL.md, step 2). This creates a surface for indirect prompt injection.
- Ingestion points: Git history, conflicting files, commit messages, and PR descriptions.
- Boundary markers: None specified.
- Capability inventory: Implied git command usage and execution of project-specific automated checks (tests, linters).
- Sanitization: No sanitization of external metadata is specified. However, the skill provides specific logic for conflict resolution and emphasizes not inventing new behavior, which limits the impact of potential injections.
Audit Metadata