resolve-merge-conflicts
Pass
Audited by Gen Agent Trust Hub on Aug 17, 2026
Risk Level: SAFECOMMAND_EXECUTION
Full Analysis
- [COMMAND_EXECUTION]: The skill uses standard version control tools (
git,gh) to manage branch synchronization, conflict resolution, and pushing changes to the remote repository. These operations are aligned with the skill's stated purpose. - [INDIRECT_PROMPT_INJECTION]: The skill processes untrusted content from file conflict markers during the resolution process. This is an inherent risk of the task, managed by instructions to surface complex conflicts to the user.
- Ingestion points: Reads file contents containing conflict markers (
<<<<<<<,=======,>>>>>>>) as described in SKILL.md Step 3 and 4. - Boundary markers: Absent.
- Capability inventory: Performs branch updates, commits, and pushes using
gitandghas described in SKILL.md Steps 2, 4, and 6. - Sanitization: Absent.
Audit Metadata