Goblin-mode merge-squashbase

Name: merge-squashbase
Author: JasonWarrenUK

{{ 𝛀𝛀𝛀 }} Squash and rebase

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-squashbase" ~/.claude/skills/jasonwarrenuk-goblin-mode-merge-squashbase && rm -rf "$T"

manifest: skills/merge-squashbase/SKILL.md

source content

Squash and Rebase 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
```
Run
```
git rebase -i origin/main
```
— in the editor, squash or fixup commits as appropriate, leaving one clean commit (or a small number of logical commits) with a descriptive message
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
```