resolving-merge-conflicts
Pass
Audited by Gen Agent Trust Hub on Jul 7, 2026
Risk Level: SAFECOMMAND_EXECUTIONPROMPT_INJECTION
Full Analysis
- [SAFE]: The skill provides standard procedural instructions for git conflict resolution and verification without any detected malicious patterns or obfuscation.
- [COMMAND_EXECUTION]: The skill directs the agent to discover and run automated project checks such as tests, typechecks, and formatters. This is standard developer practice to ensure the integrity of the merge resolution.
- [PROMPT_INJECTION]: The skill involves an indirect prompt injection surface as it requires reading data from git history, commit messages, and pull request descriptions. This is categorized as safe/low risk as it is necessary for the intended purpose of the skill.
- Ingestion points: Git history, conflicting files, commit messages, PRs, and issues.
- Boundary markers: None specified.
- Capability inventory: Execution of shell commands for git operations and project testing scripts.
- Sanitization: None specified.
Audit Metadata