Guide a safe git rebase of the current branch onto a target branch, including conflict triage and resolution steps. Use when asked to rebase, update a branch, or resolve rebase conflicts.
Install
npx skills add jMerta/codex-skills --skill rebase-assistantnpx skills add jMerta/codex-skills --skill rebase-assistant -a claude-code -gnpx skills add jMerta/codex-skills --skill rebase-assistant -a codex -ggemini skills install https://github.com/jMerta/codex-skills.git --path rebase-assistantgh skill install jMerta/codex-skills rebase-assistantgit clone --depth 1 https://github.com/jMerta/codex-skills /tmp/jMerta__codex-skills
mkdir -p ~/.claude/skills ~/.agents/skills
cp -R /tmp/jMerta__codex-skills/rebase-assistant ~/.claude/skills/rebase-assistant # Claude Code
cp -R /tmp/jMerta__codex-skills/rebase-assistant ~/.agents/skills/rebase-assistant # Codex, Cursor, Gemini CLI, Copilot, OpenCode