The Agent Skills Directory

[COMMAND_EXECUTION]: The skill utilizes common development and version control commands such as git, pnpm, npx, grep, and cat. These are used for their intended purposes within a conflict resolution workflow.
[DYNAMIC_EXECUTION]: The skill involves manual resolution of code conflicts and subsequent execution of tests and type checks (pnpm test, pnpm typecheck). This is a standard part of the developer workflow for ensuring code integrity after a merge.
[INDIRECT_PROMPT_INJECTION]: The skill processes external data in the form of code conflict markers, which represents a potential attack surface for indirect prompt injection.
Ingestion points: Files containing merge conflicts accessed via cat, git status, and git diff.
Boundary markers: Standard git conflict markers serve as delimiters in the processed files.
Capability inventory: The skill has capabilities to read/write files and execute shell commands for version control and testing.
Sanitization: The process requires the agent to analyze the intent of changes and verify resolutions through testing and type checking before completing operations.

conflict-resolution