pulling-updates-from-skills-repositorylisted
Install: claude install-skill magnusrodseth/dotfiles
# 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:
```bash
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:
```bash
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:
```bash
TRACKING_REMOTE=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null | cut -d'/' -f1 || echo "")
```
Then fetch from the appropriate remote:
```bash
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:
```bash
git log HEAD..@{u} --oneline
```
Show user: List of new commits b