resolving-merge-conflicts
Pass
Audited by Gen Agent Trust Hub on Aug 19, 2026
Risk Level: SAFE
Full Analysis
- [INDIRECT_PROMPT_INJECTION]: The skill processes untrusted external data by reading conflicting file content, commit messages, and pull request descriptions. This represents a potential surface for indirect prompt injection where malicious instructions embedded in a code repository could attempt to influence the agent. However, the skill includes instructions to strictly follow original intent and run existing project validation tools, which helps mitigate accidental misbehavior.
- [COMMAND_EXECUTION]: The skill directs the agent to execute local shell commands, including git operations (stage, commit, rebase) and project-specific automated checks (tests, typecheck, format). These are standard development tasks consistent with the skill's primary purpose of code conflict resolution.
Audit Metadata