git-workflow
The git-workflow skill provides structured guidance for common version control tasks including pull request preparation, branch cleanup, and merge conflict resolution. Use it when preparing PRs with proper titles and descriptions, cleaning up merged branches safely, or resolving conflicts between branches in standard or monorepo repositories.
git clone --depth 1 https://github.com/jezweb/claude-skills /tmp/git-workflow && cp -r /tmp/git-workflow/plugins/dev-tools/skills/git-workflow ~/.claude/skills/git-workflowSKILL.md
# Git Workflow
Guided workflows for common git operations that benefit from structured steps.
## PR Preparation
When preparing a pull request:
1. **Gather context**
- `git log main..HEAD --oneline` — list all commits on the branch
- `git diff main...HEAD --stat` — see all changed files
- `git status` — check for uncommitted work
2. **Draft PR content**
- Title: under 70 chars, describes the change (not the branch name)
- Body: summarise the "why", list key changes, add test plan
- Use the commit history to write the summary — don't rely on memory
3. **Push and create**
```bash
git push -u origin HEAD
gh pr create --title "..." --body "$(cat <<'EOF'
## Summary
- ...
## Test plan
- [ ] ...
🤖 Generated with [Claude Code](https://claude.com/claude-code)
EOF
)"
```
4. **Verify** — `gh pr view --web` to open in browser
## Branch Cleanup
Clean up merged branches safely:
1. **Switch to main and pull latest**
```bash
git checkout main && git pull
```
2. **List merged branches** (excludes main/master/develop)
```bash
git branch --merged main | grep -vE '^\*|main|master|develop'
```
3. **Delete local merged branches**
```bash
git branch --merged main | grep -vE '^\*|main|master|develop' | xargs -r git branch -d
```
4. **Prune remote tracking refs**
```bash
git fetch --prune
```
5. **List remote branches with no local tracking** (optional)
```bash
git branch -r --merged origin/main | grep -vE 'main|master|develop|HEAD'
```
## Merge Conflict Resolution
When a PR has conflicts:
1. **Assess the conflict scope**
```bash
git fetch origin
git merge origin/main --no-commit --no-ff
git diff --name-only --diff-filter=U # List conflicted files
```
2. **For each conflicted file**, read the file and resolve:
- Keep both changes if they're in different areas
- If architecturally incompatible, prefer the main branch's approach and re-apply the PR's intent on top
3. **If rebase is cleaner** (few commits, no shared history):
```bash
git rebase origin/main
# Resolve conflicts per commit, then:
git rebase --continue
```
4. **If rebase is messy** (many conflicts, architectural divergence):
- Abort: `git rebase --abort` or `git merge --abort`
- Extract useful code: `git show origin/branch:path/to/file > /tmp/extracted.txt`
- Apply changes manually to main
- Close original PR with explanation
5. **Verify** — run tests, check the diff looks right
## Monorepo Release Tags
In monorepos, scope tags to the package:
```bash
# ❌ Ambiguous in monorepos
git tag v2.1.0
# ✅ Scoped to package
git tag contextbricks-v2.1.0
git push origin contextbricks-v2.1.0
```
Pattern: `{package-name}-v{semver}`
## .gitignore-First Init
When creating a new repo, always create `.gitignore` BEFORE the first `git add`:
```bash
cat > .gitignore << 'EOF'
node_modules/
.wrangler/
dist/
.dev.vars
*.log
.DS_Store
.env
.env.local
EOF
git init && git add . && git commit -m "Initial commit"
```
**If node_modules is already tracked:**
```bash
git rm -r --cached node_modules/
git commit -m "Remove node_modules from tracking"
```
## Private Repo License Audit
Before publishing or sharing a private repo:
```bash
gh repo view --json visibility -q '.visibility'
```
If `PRIVATE`, ensure:
- `LICENSE` contains proprietary notice (not MIT/Apache)
- `package.json` has `"license": "UNLICENSED"` and `"private": true`
- No `CONTRIBUTING.md` or "contributions welcome" in READMEGenerate AI images using Gemini or GPT APIs directly. Covers model selection (Gemini for scenes; GPT Image 2 for text rendering, batch variations, multi-reference compositing; GPT Image 1.5 for transparent icons), the 5-part prompting framework, API calling patterns, multi-turn editing, and quality assurance. Produces photorealistic scenes, icons, illustrations, OG images, posters, infographics, and product shots. Use when building websites that need images, creating marketing assets, or generating visual content. Triggers: 'generate image', 'ai image', 'create hero image', 'make an icon', 'generate illustration', 'create og image', 'poster', 'infographic', 'image variations', 'gpt-image-2', 'ai art', 'image generation'.
Generate complete user documentation for a web app with screenshots. Browses the app via browser automation, screenshots every screen, and produces a structured user guide with step-by-step instructions, annotated screenshots, workflow diagrams, and reference tables. Supports quick (key screens), standard (all pages), thorough (every state and flow), and exhaustive (publishable documentation suite). Triggers: 'document the app', 'user guide', 'app documentation', 'screenshot docs', 'generate user docs', 'help docs', 'how-to guide', 'write the docs'.
Australian business English for professional writing — warm, direct, EN-AU spelling (colour, organise, centre), no filler words. Use whenever the user is writing for an Australian audience: emails, chat messages, proposals, client communications, blog posts, web copy, or any business writing. Apply to drafting, editing, and tone-checking professional text.
Write compelling award submissions, grant applications, and competition entries. Maps achievements to selection criteria using evidence-based narratives. Use whenever the user is applying for a business award (Telstra, chamber of commerce, industry awards), a grant, a competition, or any submission demonstrating merit against defined criteria.
Get a second opinion from leading AI models on code, architecture, strategy, prompting, or anything. Queries models via OpenRouter, Gemini, or OpenAI APIs. Supports single opinion, multi-model consensus, and devil's advocate patterns. Use whenever the user says 'brains trust', 'second opinion', 'ask gemini', 'ask gpt', 'peer review', 'consult another model', 'challenge this', or 'devil's advocate'.
Hit the Cloudflare REST API directly for operations that wrangler and MCP can't handle well. Bulk DNS, custom hostnames, email routing, cache purge, WAF rules, redirect rules, zone settings, Worker routes, D1 cross-database queries, R2 bulk operations, KV bulk read/write, Vectorize queries, Queues, and fleet-wide resource audits. Produces curl commands or scripts. Triggers: 'cloudflare api', 'bulk dns', 'custom hostname', 'email routing', 'cache purge', 'waf rule', 'd1 query', 'r2 bucket', 'kv bulk', 'vectorize query', 'audit resources', 'fleet operation'.
Scaffold and deploy Cloudflare Workers with Hono routing, Vite plugin, and Static Assets. Describe project, scaffold structure, configure bindings, deploy. Use whenever the user wants to create a Worker project, set up Hono on Cloudflare, configure D1 / R2 / KV / Queues bindings, or troubleshoot Worker export syntax, API route conflicts, HMR issues, or deployment failures.
Run an independent code review using the OpenAI Codex CLI in headless mode. Gets a second opinion from a different model family (the current Codex models) on recent changes, a PR, a commit, or the whole app — covering bugs, regressions, security, data consistency, UX/state bugs, performance risks, and testing gaps. Saves a severity-prioritised report to .jez/reviews/. Triggers: 'codex review', 'review with codex', 'independent code review', 'what does codex think', 'get codex to review'.