Goblin-mode merge-from-named

Name: merge-from-named
Author: JasonWarrenUK

{{ 𝛀𝛀𝛀 }} Merge from branch

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

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

source content

Merge Branch into Current Branch

$ARGUMENTS (required) — the branch to merge from

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

Run

git fetch origin $BRANCH && git merge origin/$BRANCH

If conflicts exist, list them and resolve preserving our branch's intent
Run tests to verify
Push with
```
git push
```