Goblin-mode merge-from-main

{{ 𝛀𝛀𝛀 }} Merge 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-from-main" ~/.claude/skills/jasonwarrenuk-goblin-mode-merge-from-main && rm -rf "$T"

manifest: skills/merge-from-main/SKILL.md

source content

<task name="Merge Main into Current Branch"> <user-guidance>$ARGUMENTS</user-guidance> <steps> 1. Check current branch name and confirm with user 2. Do NOT create a worktree - work in the current directory 3. Run `git fetch origin main && git merge origin/main` 4. If conflicts exist, list them and resolve preserving our branch's intent. 5. Run tests to verify 6. Push with `git push` </steps> </task>