← ClaudeAtlas

rebaselisted

Rebase current branch onto trunk (origin/master or origin/main), predict and resolve conflicts
tony/ai-workflow-plugins · ★ 2 · AI & Automation · score 59
Install: claude install-skill tony/ai-workflow-plugins
## 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 1. Run `git fetch origin` to get the latest remote state. 2. Run `git diff origin/${TRUNK}...HEAD --stat` to see what files the current branch modifies. 3. Run `git diff origin/${TRUNK}...HEAD` to see the full diff of changes on this branch. 4. Run `git log --oneline origin/${TRUNK}..HEAD` to see commits that will be rebased. 5. Ru