AI SummaryRebase the current branch onto the remote trunk branch. Follow these steps carefully, handling each phase before moving to the next. Determine the trunk branch name from the context above (the "Trunk branch" value). Store it mentally as . It will typically be or . If detection failed, try both and
Install
Copy this and paste it into Claude Code, Cursor, or any AI assistant:
I want to install the "claude-code-riper-5" skill in my project. Please run this command in my terminal: # Install skill into your project (11 files) mkdir -p .claude/skills/commands && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/SKILL.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/rebase.md" && mkdir -p .claude/skills/commands/memory && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/memory/list.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/memory/list.md" && mkdir -p .claude/skills/commands/memory && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/memory/recall.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/memory/recall.md" && mkdir -p .claude/skills/commands/memory && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/memory/save.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/memory/save.md" && mkdir -p .claude/skills/commands/riper && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/riper/execute.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/riper/execute.md" && mkdir -p .claude/skills/commands/riper && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/riper/innovate.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/riper/innovate.md" && mkdir -p .claude/skills/commands/riper && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/riper/plan.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/riper/plan.md" && mkdir -p .claude/skills/commands/riper && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/riper/research.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/riper/research.md" && mkdir -p .claude/skills/commands/riper && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/riper/review.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/riper/review.md" && mkdir -p .claude/skills/commands/riper && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/riper/strict.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/riper/strict.md" && mkdir -p .claude/skills/commands/riper && curl --retry 3 --retry-delay 2 --retry-all-errors -o .claude/skills/commands/riper/workflow.md "https://raw.githubusercontent.com/tony/claude-code-riper-5/main/.claude/commands/riper/workflow.md" Then restart Claude Code (or reload the window in Cursor) so the skill is picked up.
Description
Rebase current branch onto trunk (origin/master or origin/main), predict and resolve conflicts
Context
• Current branch: !git branch --show-current • Trunk branch: !git remote show origin 2>/dev/null | grep 'HEAD branch' | awk '{print $NF}' || echo "master" • Remote refs available: !git remote -v 2>/dev/null | head -2 • Commits on current branch not on trunk: !TRUNK=$(git remote show origin 2>/dev/null | grep 'HEAD branch' | awk '{print $NF}' || echo "master"); git log --oneline "origin/${TRUNK}..HEAD" 2>/dev/null || echo "(could not determine commits ahead)" • Diff from trunk (summary): !TRUNK=$(git remote show origin 2>/dev/null | grep 'HEAD branch' | awk '{print $NF}' || echo "master"); git diff --stat "origin/${TRUNK}" 2>/dev/null || echo "(could not diff against trunk)"
Your Task
Rebase the current branch onto the remote trunk branch. Follow these steps carefully, handling each phase before moving to the next.
Phase 1: Detect trunk branch
Determine the trunk branch name from the context above (the "Trunk branch" value). Store it mentally as TRUNK. It will typically be master or main. If detection failed, try both origin/master and origin/main to see which exists.
Phase 2: Fetch latest and analyze
• Run git fetch origin to get the latest remote state. • Run git diff origin/${TRUNK}...HEAD --stat to see what files the current branch modifies. • Run git diff origin/${TRUNK}...HEAD to see the full diff of changes on this branch. • Run git log --oneline origin/${TRUNK}..HEAD to see commits that will be rebased. • Run git diff origin/${TRUNK} -- $(git diff --name-only origin/${TRUNK}...HEAD) to check if trunk has also modified any of the same files — these are potential conflict zones. Report a brief summary of: • How many commits will be rebased • Which files were changed on this branch • Which of those files were ALSO changed on trunk (potential conflicts) • An assessment of conflict likelihood (none expected / minor / significant)
Discussion
Health Signals
My Fox Den
Community Rating
Sign in to rate this booster