This skill should be used when the user needs help with git operations, merge conflicts, branch management, or commit cleanup. It provides advanced git workflow management including branching strategies, merge conflict resolution, interactive rebase guidance, and commit hygiene.
Advanced git operations, branching strategies, conflict resolution, and commit hygiene best practices.
main ─────────────────────────────────
└── feature/short-lived (1-2 days) ──┘
main ────────────────────────────────
develop ─────────────────────────────
└── feature/xxx ──┘ └── release/x.y ──┘
type(scope): subject
body (optional)
footer (optional)
Types: feat, fix, docs, style, refactor, test, chore, perf, ci, build
git statusgit rebase -i HEAD~N
# Use: pick, squash, reword, drop, edit
git cherry-pick <commit-hash>
# With conflict: resolve, then git cherry-pick --continue
git reflog # Find the lost commit
git checkout <hash> # Or git cherry-pick <hash>
git bisect start
git bisect bad # Current commit is bad
git bisect good <known-good-hash>
# Test each commit, mark good/bad
git bisect reset # When done
User: "Clean up my last 5 commits before PR"
git log --oneline -5User: "Help me fix this merge conflict"
git status to see conflicted filesSearch for places (restaurants, cafes, etc.) via Google Places API proxy on localhost.
Interact with GitHub using the `gh` CLI. Use `gh issue`, `gh pr`, `gh run`, and `gh api` for issues, PRs, CI runs, and advanced queries.
Create or update AgentSkills. Use when designing, structuring, or packaging skills with scripts, references, and assets.
Start voice calls via the OpenClaw voice-call plugin.
Notion API for creating and managing pages, databases, and blocks.
Gemini CLI for one-shot Q&A, summaries, and generation.
Category:developer