菜单
Merge feature branches back to their base branches across the main repo and submodules. Use when user says "merge feature", "finish feature", "merge back", or invokes /git-dev-merge.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Build the Blured Engine (OpenCode + Godot)
Guided game creation workflow — choose gameplay-first or visual-first path to build a complete playable game. Use when user wants to create a new game, says "create a platformer", "make a game", "new game project", or similar.
Replicate a UI layout from a cornerstone reference image into a pixel-perfect .tscn scene. Use when user says "replicate UI layout", "build layout from reference", "1:1 UI copy", or has a cornerstone UI image to turn into a scene.
Create polished player-facing UI from whitebox to final assets. 5-step workflow from UI mockup to deployed game UI. Do NOT use for whitebox/prototype UI.
Package the Blured Engine into a distributable directory
Stage, commit, and push git changes with conventional commit messages. Use when user wants to commit and push changes, mentions pushing to remote, or asks to save and push their work. Also activates when user says "push changes", "commit and push", "push this", "push to github", or similar git workflow requests.
| name | git-dev-merge |
| description | Merge feature branches back to their base branches across the main repo and submodules. Use when user says "merge feature", "finish feature", "merge back", or invokes /git-dev-merge. |
Merge feature branches back to their base branches across the main repo and submodules.
origin → github.com:bluredengine/blured.git, base branch mainorigin → github.com:bluredengine/godot.git, base branch mainorigin → github.com:bluredengine/opencode.git, base branch mainThe script auto-detects the workspace root from its own location.
ALWAYS use the script (from any workspace):
bash "<workspace>/.claude/skills/git-dev-merge/scripts/merge.sh" "<feature-branch>" "<issue-number>"
Both arguments are optional:
<feature-branch> is omitted, auto-detects from the current branch in the main repo<issue-number> is omitted, no issue is closed# Auto-detect branch, no issue
bash "<workspace>/.claude/skills/git-dev-merge/scripts/merge.sh"
# Explicit branch and issue
bash "<workspace>/.claude/skills/git-dev-merge/scripts/merge.sh" "feature/7-ai-mesh-generation" "7"
/git-pushing before running this if there are uncommitted changesfeature/<branch> → main, deletes feature branchfeature/<branch> → main, deletes feature branchfeature/<branch> → main, deletes feature branchAfter running the script, also:
CLAUDE.local.md if it exists--no-ff to preserve merge history--no-verify when pushing submodules (upstream hooks may fail on forks)