resolve-merge-conflicts

スキルの内容

A gh-aw maintainer skill for merging the main branch into a working branch. Its bundled shell script handles the common case where the only conflicts are in the generated workflow lock files: it merges, regenerates those files instead of hand-editing them and stops if any other file conflicts. The script works whether the merge has started or not. It depends on gh-aw's workflow compiler.

できること

詳細