The Agent Skills Directory

[SAFE]: The skill uses standard Git commands such as git diff, git add, git commit, git rebase, and git cherry-pick to manage the repository state. These commands are used as intended for the stated purpose of resolving merge conflicts.
[SAFE]: Potential for Indirect Prompt Injection was evaluated due to the ingestion of untrusted source code and manifest files.
Ingestion points: The agent reads the contents of files containing Git conflict markers and a local .repo-sync-conflicts.json manifest file.
Boundary markers: No explicit delimiters or boundary markers are used when reading external file contents.
Capability inventory: The agent has the capability to modify the repository state using git add, git rm, and git commit commands.
Sanitization: The risk is mitigated by explicit instructions and constraints provided in the skill, which direct the agent to focus strictly on conflict resolution and avoid making unrelated changes.

conflict-resolution