git-conflict-resolve
Pass
Audited by Gen Agent Trust Hub on Jul 29, 2026
Risk Level: SAFE
Full Analysis
- [SAFE]: The skill utilizes standard Git operations (git checkout, git merge, git rebase) to manage local repository states. All analysis and resolution steps occur locally without external network dependencies or data transmission.
- [SAFE]: Robust verification is integrated throughout the workflow. Sub-phases Y.4.5, Y.5, and Y.6 use specialized git grep scans with strict regular expressions to detect and prevent residual conflict markers from being committed.
- [SAFE]: The build artifact detection logic (Y.1.5) identifies machine-generated files and applies a short-circuit strategy, ensuring high-fidelity resolution for compressed assets while reducing computational overhead.
- [PROMPT_INJECTION]: The skill processes untrusted repository content (files from source/target branches) which represents an indirect prompt injection surface. However, this is mitigated by strict structural delimiters and multiple validation gates before any changes are committed.
- Ingestion points: Files are read via git show and git diff in Phase Y.2 for semantic analysis.
- Boundary markers: Uses clear text headers (e.g., 【语义分析 — 】) to separate untrusted code from instructions.
- Capability inventory: Local filesystem modification and Git commit capabilities.
- Sanitization: Automated regex-based verification of output files prior to staging and final commit.
Audit Metadata