The Agent Skills Directory

[COMMAND_EXECUTION]: The skill executes the make recompile command to regenerate workflow lock files from source. This is a standard build operation within a development environment and is consistent with the skill's stated purpose of resolving generated file conflicts.
[COMMAND_EXECUTION]: The skill automates several Git operations, including git merge, git add, git diff, and git status. The script uses best practices for handling potentially untrusted file names, such as using NUL delimiters (-z) with git diff and mapfile, which prevents common shell injection vulnerabilities related to special characters in filenames.

resolve-merge-conflicts