Goblin-mode merge-rebase

Name: merge-rebase
Author: JasonWarrenUK

{{ 𝛀𝛀𝛀 }} Rebase from main

install

source · Clone the upstream repo

git clone https://github.com/JasonWarrenUK/goblin-mode

Claude Code · Install into ~/.claude/skills/

T=$(mktemp -d) && git clone --depth=1 https://github.com/JasonWarrenUK/goblin-mode "$T" && mkdir -p ~/.claude/skills && cp -r "$T/skills/merge-rebase" ~/.claude/skills/jasonwarrenuk-goblin-mode-merge-rebase && rm -rf "$T"

manifest: skills/merge-rebase/SKILL.md

source content

Rebase Current Branch onto Main

Check current branch name and confirm with user
Do NOT create a worktree - work in the current directory

Run

git fetch origin main && git rebase origin/main

If conflicts exist, list them and resolve one at a time preserving our branch's intent, running
```
git rebase --continue
```
after each
Run tests to verify
Push with
```
git push --force-with-lease
```