Merge a base ref and safely regenerate compiled workflow lock-file conflicts.
安装
npx skills add github/gh-aw --skill resolve-merge-conflictsnpx skills add github/gh-aw --skill resolve-merge-conflicts -a claude-code -gnpx skills add github/gh-aw --skill resolve-merge-conflicts -a codex -ggemini skills install https://github.com/github/gh-aw.git --path .github/skills/resolve-merge-conflictsgh skill install github/gh-aw resolve-merge-conflictsgit clone --depth 1 https://github.com/github/gh-aw /tmp/github__gh-aw
mkdir -p ~/.claude/skills ~/.agents/skills
cp -R /tmp/github__gh-aw/.github/skills/resolve-merge-conflicts ~/.claude/skills/resolve-merge-conflicts # Claude Code
cp -R /tmp/github__gh-aw/.github/skills/resolve-merge-conflicts ~/.agents/skills/resolve-merge-conflicts # Codex, Cursor, Gemini CLI, Copilot, OpenCode