ViggyV/Pulling Updates from Skills Repository

Updating Skills from Upstream

Overview

Pull and merge upstream changes from obra/superpowers-skills into your local skills repository while preserving your personal modifications.

Announce at start: "I'm using the Updating Skills skill to sync with upstream."

Prerequisites

Your skills repo must have a tracking branch configured. The plugin sets this up automatically (either as a fork with origin remote, or with an upstream remote).

The Process

Step 1: Check Current Status

Run:

cd ~/.config/superpowers/skills
git status

If working directory is dirty: Proceed to Step 2 (stash changes) If clean: Skip to Step 3

Step 2: Stash Uncommitted Changes (if needed)

Run:

git stash push -m "Temporary stash before upstream update"

Record: Whether changes were stashed (you'll need to unstash later)

Step 3: Determine Tracking Remote and Fetch

First, detect which remote to use:

TRACKING_REMOTE=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null | cut -d'/' -f1 || echo "")

Then fetch from the appropriate remote:

if [ -n "$TRACKING_REMOTE" ]; then
    git fetch "$TRACKING_REMOTE" 2>/dev/null || true
else
    git fetch upstream 2>/dev/null || git fetch origin 2>/dev/null || true
fi

Expected: Fetches latest commits from the tracking remote (or falls back to upstream/origin)

Step 4: Check What's New

Run:

git log HEAD..@{u} --oneline

Show user: List of new commits being pulled

Note: @{u} refers to the upstream tracking branch for your current branch

Step 5: Merge Changes

First, try a fast-forward merge (cleanest option):

git merge --ff-only @{u}

If fast-forward succeeds: Skip to Step 7 (no conflicts possible with fast-forward) If fast-forward fails: Your branch has diverged. Try regular merge:

git merge @{u}

If merge succeeds cleanly: Proceed to Step 7 If conflicts occur: Proceed to conflict resolution

Step 6: Handle Merge Conflicts (if any)

If conflicts:

1. Run git status to see conflicted files
2. For each conflict, explain to user what changed in both versions
3. Ask user which version to keep or how to merge
4. Edit files to resolve
5. Run git add <resolved-file> for each
6. Run git commit to complete merge

Step 7: Unstash Changes (if stashed in Step 2)

If you stashed changes:

git stash pop

If conflicts with unstashed changes: Help user resolve them

Step 8: Verify Everything Works

Run:

${SUPERPOWERS_SKILLS_ROOT}/skills/using-skills/find-skills

Expected: Skills list displays correctly

Step 9: Announce Completion

Tell user:

• How many new commits were merged
• Whether any conflicts were resolved
• Whether their stashed changes were restored
• That skills are now up to date

Common Issues

"Already up to date": Your local repo is current, no action needed

"fatal: no upstream configured": Your branch isn't tracking a remote branch. Check git remote -v to see available remotes, then set tracking with git branch --set-upstream-to=<remote>/<branch>

Detached HEAD: You're not on a branch. Ask user if they want to create a branch or check out main.

Fast-forward fails, diverged branches: Your local branch has commits that aren't in the remote. Regular merge will be needed, which may cause conflicts.

Remember

• Always stash uncommitted work before merging
• Explain conflicts clearly to user
• Test that skills work after update
• User's local commits/branches are preserved