Resolve the conflicting files of the rebase the spec loop stopped on, then stage them and stop.
Install
npx skills add MalcolmMcNeely/skillworks --skill resolve-conflictnpx skills add MalcolmMcNeely/skillworks --skill resolve-conflict -a claude-code -gnpx skills add MalcolmMcNeely/skillworks --skill resolve-conflict -a codex -ggemini skills install https://github.com/MalcolmMcNeely/skillworks.git --path plugins/skillworks/skills/resolve-conflictgh skill install MalcolmMcNeely/skillworks resolve-conflictgit clone --depth 1 https://github.com/MalcolmMcNeely/skillworks /tmp/MalcolmMcNeely__skillworks
mkdir -p ~/.claude/skills ~/.agents/skills
cp -R /tmp/MalcolmMcNeely__skillworks/plugins/skillworks/skills/resolve-conflict ~/.claude/skills/resolve-conflict # Claude Code
cp -R /tmp/MalcolmMcNeely__skillworks/plugins/skillworks/skills/resolve-conflict ~/.agents/skills/resolve-conflict # Codex, Cursor, Gemini CLI, Copilot, OpenCode