git-conflict-resolve
Pass
Audited by Gen Agent Trust Hub on Mar 7, 2026
Risk Level: SAFECOMMAND_EXECUTION
Full Analysis
- [COMMAND_EXECUTION]: The skill utilizes standard Git CLI commands (
git status,git diff,git checkout,git add,git commit,git rebase) and basic filesystem operations (mkdir,cp) to manage the conflict resolution process. These operations are restricted to the local workspace and are necessary for the skill's stated functionality. - [PROMPT_INJECTION]: As an indirect prompt injection surface (Category 8), the skill processes untrusted data in the form of conflicted source code files.
- Ingestion points: Conflicted files read during the analysis phase and outputs from
git showcommands. - Boundary markers: The skill explicitly relies on standard Git conflict markers (
<<<<<<<,=======,>>>>>>>) to delineate conflicting sections. - Capability inventory: The skill has the ability to write to the filesystem (backups and reports) and execute git commands to modify the repository state.
- Sanitization: There is no explicit sanitization of the code content, but the skill's logic is focused on structural resolution and reporting rather than executing the content of the files.
Audit Metadata