메뉴
Guide users through git workflows, best practices, commit messages, branching strategies, and resolving common version control issues. Use this when users need help with git operations or workflow decisions.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
Read a prototype GDD and generate a phased implementation roadmap with concrete tasks, organized by implementation phases with specific deliverables and test criteria.
Generate complete, game-ready VFX scenes for Godot 4.x using NO custom art assets. Creates procedural effects using GPUParticles2D, ColorRect, Line2D, and geometric shapes. Use this when the user wants to create visual effects without sprites.
Implement tool features from roadmaps, building editor plugins, standalone tools, and CLI utilities for game development. Use this when implementing features from a tool roadmap.
Create phased implementation roadmaps for development tools, breaking them into MVP, enhancements, and polish phases with feature-level deliverables compatible with tool-feature-implementer.
Build and maintain a living architecture document tracking scene trees, data structures, system hierarchies, and game architecture. Use this when visualizing game structure, documenting scene hierarchies, or tracking data schemas.
Add animations to existing PixelLab characters. Lists available characters, shows animation templates organized by category (movement, combat, utility), and supports custom action descriptions. Use this when the user wants to animate a character sprite.
| name | version-control-helper |
| description | Guide users through git workflows, best practices, commit messages, branching strategies, and resolving common version control issues. Use this when users need help with git operations or workflow decisions. |
| domain | project |
| type | helper |
| version | 1.0.0 |
| allowed-tools | ["Bash","Read"] |
This skill provides guidance on git workflows, commit strategies, branch management, and resolving common version control issues for game development projects.
Invoke this skill when the user:
Git enables safe iteration and collaboration:
<type>(<scope>): <subject>
<body>
<footer>
Good commit messages:
feat(weapons): add railgun with pierce mechanic
- Damage: 100
- Fire rate: 0.5/s
- Range: 600px
- Pierces up to 3 enemies
Closes #42
fix(player): prevent movement while paused
Player could move during pause menu if input buffered.
Now movement input is ignored when game_paused == true.
Fixes #38
refactor(enemies): extract hardcoded stats to resources
Converted all 5 enemy types to use EnemyData resources:
- Scout, Tank, Drone, Artillery, Elite
- Enables easy balancing without code changes
Related to #25
Bad commit messages:
❌ "fixed stuff"
❌ "wip"
❌ "update"
❌ "asdf"
❌ "final final FINAL version"
main
└─ feature/weapon-system
└─ fix/enemy-spawning
Strategy:
main = stable, working gameCommands:
# Start new feature
git checkout -b feature/weapon-rules
# Work and commit
git add .
git commit -m "feat(weapons): add target priority system"
# Merge when done
git checkout main
git merge feature/weapon-rules
git branch -d feature/weapon-rules
main (production)
└─ develop (integration)
└─ feature/player-movement
└─ feature/enemy-ai
└─ fix/collision-bug
Strategy:
main = releases only (tagged)develop = active developmentdevelopdevelop, then main for releasesCommands:
# Start feature
git checkout develop
git checkout -b feature/wave-spawning
# Work and commit
git commit -m "feat(waves): implement time-based spawning"
# Merge to develop
git checkout develop
git merge feature/wave-spawning
# Release (when ready)
git checkout main
git merge develop
git tag -a v1.0.0 -m "Release 1.0.0"
main
└─ develop
├─ release/1.0
├─ feature/new-weapon
└─ hotfix/crash-fix
Strategy:
release/X.Y branches for stabilizationmain for urgent production fixesdevelop during release stabilizationGood times to commit:
When NOT to commit:
One commit = one logical change
✅ Good:
feat(player): add dash ability
fix(enemies): correct pathfinding edge case
refactor(weapons): extract data to resources
❌ Bad:
"updated player, fixed enemies, changed weapons, added UI"
Essential .gitignore:
# Godot-specific ignores
.import/
export.cfg
export_presets.cfg
# Godot 4+ specific
.godot/
# Builds
builds/
exports/
# Logs
*.log
# OS
.DS_Store
Thumbs.db
# IDE
.vscode/
.idea/
# Addons (if external)
addons/
# Sensitive data
*.secret
credentials.json
.env
If not pushed yet:
# Fix files, then amend commit
git add .
git commit --amend --no-edit
# Or change commit message too
git commit --amend -m "fix(player): correct movement speed"
If already pushed:
# Create new commit fixing the issue
git add .
git commit -m "fix(player): correct movement speed regression from previous commit"
Keep changes, undo commit:
git reset --soft HEAD~1
Discard changes and commit:
git reset --hard HEAD~1
Resolve conflicts:
git status # See which files have conflicts
# Edit files, look for:
# <<<<<<< HEAD
# Your changes
# =======
# Their changes
# >>>>>>> branch-name
# Choose which version to keep, or combine them
git add <resolved-files>
git commit -m "merge: resolve conflicts in enemy system"
Abort merge:
git merge --abort
Use git stash:
# Stash changes
git stash save "WIP: weapon rule system half done"
# Do other work, switch branches, etc.
# Restore stashed changes
git stash pop
If not pushed:
# Note the commit hash
git log # Copy commit hash
# Undo commit on current branch
git reset --hard HEAD~1
# Switch to correct branch
git checkout correct-branch
# Apply commit
git cherry-pick <commit-hash>
Create branch from old commit/tag:
# View history
git log --oneline
# Checkout old commit
git checkout <commit-hash>
# Create branch from it
git checkout -b hotfix/old-version-bug
main + feature branchesmain when stablemainmain + develop + feature branchesdevelop, periodically merge to main for releasesmain branch (no direct commits)Problem: Large binary files (sprites, audio) bloat git history
Solution: Git LFS (Large File Storage)
# Install git-lfs
git lfs install
# Track large file types
git lfs track "*.png"
git lfs track "*.wav"
git lfs track "*.ogg"
# Add .gitattributes
git add .gitattributes
git commit -m "chore: configure git lfs for binary assets"
Commit .import folder?
.import/ (regenerated by Godot)Scene conflicts:
.tscn files are text-based, merge carefullyExport presets:
export_presets.cfg (contains local paths)Create annotated tag:
git tag -a v1.0.0 -m "Release 1.0.0 - Initial release"
Push tags:
git push origin v1.0.0
# Or push all tags
git push --tags
Tag naming:
v1.0.0, v1.1.0, v2.0.0v1.0.0-alpha.1, v1.0.0-beta.2, v1.0.0-rc.1Add to ~/.gitconfig:
[alias]
# Quick status
s = status -s
# Pretty log
lg = log --oneline --graph --decorate --all
# Last commit
last = log -1 HEAD --stat
# Undo last commit (keep changes)
undo = reset --soft HEAD~1
# Amend last commit
amend = commit --amend --no-edit
# Show changes
d = diff
ds = diff --staged
Prevent commits that:
print("DEBUG:"))Example hook: .git/hooks/pre-commit
#!/bin/bash
# Check for debug print statements
if git diff --cached | grep -i "print.*debug"; then
echo "Error: Debug print statements found"
exit 1
fi
Create .github/pull_request_template.md:
## What does this PR do?
[Brief description]
## Type of change
- [ ] Bug fix
- [ ] New feature
- [ ] Refactor
- [ ] Documentation
## Testing
- [ ] Tested in-game
- [ ] No console errors
- [ ] Doesn't break existing features
## Screenshots
[If UI/visual changes]
Create .github/ISSUE_TEMPLATE/bug_report.md
# Stash changes
git stash
# Switch branch
git checkout other-branch
# Return and restore
git checkout original-branch
git stash pop
# Use git-lfs (see above)
# Or use BFG Repo-Cleaner to remove large files from history
# If not pushed: amend commit
git reset HEAD~1
# Remove secrets, then commit again
# If pushed: rotate secrets immediately, then:
git filter-branch --force --index-filter \
"git rm --cached --ignore-unmatch path/to/secret" \
--prune-empty --tag-name-filter cat -- --all
User: "How do I use git for my game?" User: "What's a good commit message for adding a weapon?" User: "I have merge conflicts, help!" User: "Should I commit .import folder?" User: "What branching strategy for solo dev?" User: "How do I undo last commit?"
This skill helps users maintain clean git history, collaborate effectively, and never lose work during game development.