merge-conflict-resolution
Pass
Audited by Gen Agent Trust Hub on Feb 28, 2026
Risk Level: SAFECOMMAND_EXECUTION
Full Analysis
- [COMMAND_EXECUTION]: The skill uses various git commands including git diff, git show, git add, and git rebase to analyze and resolve conflicts.
- [COMMAND_EXECUTION]: Employs standard Unix utilities like sed and head to inspect specific portions of conflicted files for manual reconciliation.
- [COMMAND_EXECUTION]: References local vendor-specific scripts (scripts/git-status.sh and scripts/git-diff.sh) to confirm the success of conflict resolution steps.
- [SAFE]: Implements mandatory analysis steps and 'Must Not' rules that prevent blind resolutions (e.g., prohibiting automatic 'ours' or 'theirs' checkouts).
- [SAFE]: Explicitly requires the agent to halt and seek maintainer input when encountering conflicts in source-of-truth documentation or contradictory intents.
Audit Metadata