Git & Ship — Quản lý code và deploy

Quản lý git workflow, tạo worktree cho parallel development, và ship code lên production.

Cập nhật bộ claudekit mới: Thêm /land-and-deploy (merge → deploy), /canary (post-deploy monitoring), /setup-deploy (config deploy platform), /ghpm (GitHub project management), /ship official|beta (tagged releases). Xem cấu trúc skill mới để biết đầy đủ.

Cú pháp

/git                      # Git operations với conventional commits
/worktree                 # Tạo isolated git worktree cho parallel dev
/ship official|beta       # Ship pipeline với release tags
/land-and-deploy          # Merge → deploy → monitor
/canary                   # Post-deploy monitoring + health check
/setup-deploy             # Config deploy platform (Vercel, Netlify, Fly...)
/ghpm                     # GitHub project management (labels, board, handoff)

Bảng tham chiếu nhanh

Lệnh	Mô tả	Use case
`/git`	Staging, committing, pushing, PRs, merges	Daily git operations
`/worktree`	Tạo git worktree riêng biệt	Parallel development trong monorepo
`/ship official\|beta`	Ship pipeline với release tags	Tag release version
`/land-and-deploy`	Merge PR → deploy to staging/prod → monitor	Full merge-to-deploy
`/canary`	Post-deploy monitoring + health check	Verify deployment health
`/setup-deploy`	Config deploy platform (Vercel/Netlify/Fly)	First-time deploy setup
`/ghpm`	GitHub project management (labels, board, handoff)	Organize issues + PRs

/git — Git operations

Hỗ trợ conventional commits tự động:

/git                    # Auto-detect changes, suggest commit message
/git commit             # Stage + commit với conventional format
/git push               # Push + tạo PR nếu cần

Commit format tự động:

feat(auth): add Google OAuth login
fix(api): handle null response from payment gateway
chore(deps): upgrade Next.js to 14.2

/worktree — Parallel development

Cho phép chạy nhiều session Claude Code song song trên các bản sao riêng biệt của repo. Mỗi worktree có folder + branch riêng, không đụng nhau.

Cách dùng

Từ terminal
Trong session Claude Code
Cho subagent (Agent tool)

# Tạo worktree với tên cụ thể
claude --worktree feat-F01-generate-site

# Tạo worktree tự động (random name)
claude --worktree

isolation: "worktree"

Subagent chạy trong worktree riêng biệt, không ảnh hưởng main repo.

Lifecycle

Không có thay đổi → worktree + branch tự xóa khi thoát
Có thay đổi → Claude hỏi giữ lại hay xóa

File `.worktreeinclude`

Tạo ở root project, liệt kê file gitignored muốn copy vào worktree:

.env
.env.local

Use case cho project

# Terminal 1: làm feature
claude --worktree feat-F31-template-blueprints

# Terminal 2 (song song): fix bug
claude --worktree fix-builder-crash

# Terminal 3 (song song): audit
claude --worktree template-audit

Mỗi session làm việc độc lập, không sợ conflict. Rất hữu ích khi cần chạy nhiều task song song trên cùng repo!

Best practices:

Đặt tên worktree theo branch convention: feat-*, fix-*, hotfix-*
Tạo .worktreeinclude nếu project dùng .env
Dùng worktree khi cần chạy 2+ tasks song song trên cùng repo
Không dùng worktree cho task nhỏ chỉ cần 1 session

/ship — Ship pipeline với release tags

Full pipeline từ feature branch đến production với semantic versioning tags:

/ship official             # Ship as official release
/ship beta                 # Ship as beta/pre-release

Bước 1: Merge main

Pull latest từ main/staging, resolve conflicts nếu có.

Bước 2: Test

Chạy full test suite — phải PASS 100%.

Bước 3: Review diff

Review toàn bộ changes so với base branch.

Bước 4: Commit + Push

Commit final, push lên remote.

Bước 5: Create Release

Tạo semantic version tag (v1.2.3 hoặc v1.2.3-beta.1).

Bước 6: Create PR + Merge

Tạo PR, merge tới main khi approved.

/land-and-deploy — Merge + Deploy + Monitor

Full pipeline từ PR merge đến production deployment:

/land-and-deploy

Bước 1: Merge PR

Merge feature branch → main (or staging).

Bước 2: Run CI/CD

Chạy full CI pipeline (tests, build, lint).

Bước 3: Deploy

Deploy to staging/production (auto-detect platform).

Bước 4: Health Check

Verify critical endpoints alive + responding.

Bước 5: Monitor

Watch error logs, performance metrics, user issues.

/canary — Post-deploy monitoring

Monitoring sau deploy, detect issues early:

/canary

Checks:

Error rate (target: < 0.1%)
Performance metrics (latency, throughput)
Critical endpoint status
User-facing issues
Rollback trigger if needed

/setup-deploy — Config deploy platform

Cấu hình platform deploy cho project (chỉ cần 1 lần):

/setup-deploy

Supports:

Vercel (Next.js, SvelteKit, static)
Netlify (static, serverless functions)
Fly.io (Docker)
Railway (containers, databases)
AWS (ECS, Lambda)
GitHub Pages (static)

/ghpm — GitHub project management

Quản lý issues, PRs, project board, labels:

/ghpm

Features:

Auto-label issues theo title/description
Move issues on project board (backlog → in progress → done)
Create milestones + track progress
Handoff status tracking
Assign reviewers tự động

Branch naming convention

feat/F01-01-generate-site          # Feature
fix/F01-builder-crash              # Bug fix
hotfix/F13-payment-timeout         # Urgent production fix
chore/deps-upgrade-nextjs          # Dependencies, config

Khi nào dùng / không dùng

Dùng	Không dùng
Ship feature hoàn chỉnh (`/ship official`)	Chỉ commit nhỏ (dùng git CLI trực tiếp)
Parallel dev trên nhiều features (`/worktree`)	Single branch workflow, task nhỏ 1 session
Cần conventional commits tự động (`/git`)	Khi muốn manual git control
Full merge-to-deploy (`/land-and-deploy`)	Khi cần manual control trên deployment
Verify deployment health (`/canary`)	Staging env chưa sẵn deploy
Setup deploy platform (`/setup-deploy`)	Platform đã configured
Organize issues + PRs (`/ghpm`)	Manual GitHub project management

Chi tiết lệnh Git & Ship (Accordion)

/ship official — Release official version

Prefix: /ship officialFull pipeline với semantic versioning tag (v1.2.3):

/ship official

Output:

Created tag: v1.2.3
Merged to main
GitHub release page created

Khi dùng: Ready-for-production release.

/ship beta — Release beta/pre-release

Prefix: /ship betaFull pipeline với beta tag (v1.2.3-beta.1):

/ship beta

Output:

Created tag: v1.2.3-beta.1
Merged to develop/staging
GitHub pre-release page

Khi dùng: Feature flags, experimental releases, early testing.

/land-and-deploy — Merge + deploy end-to-end

Prefix: /land-and-deployFull pipeline: merge PR → CI/CD → deploy → monitor:

/land-and-deploy

Steps:

Merge PR tới main
Run full CI (tests, build, typecheck)
Deploy to production
Health check (endpoints, error rate)
Monitor logs + metrics

Output: Deployment success + health report.Khi dùng: After PR approval, ready to go live.

/canary — Post-deploy health monitoring

Prefix: /canaryMonitor deployment health after ship:

/canary

Checks:

Error rate < 0.1%?
Latency within SLA?
Critical endpoints responding?
User-facing errors detected?

Output: Health report + auto-rollback decision if needed.Khi dùng: After deployment, verify stability before clearing.

/setup-deploy — Configure deploy platform

Prefix: /setup-deployFirst-time setup for deployment platform:

/setup-deploy

Detects + configures:

Vercel (Next.js, SvelteKit)
Netlify (static, serverless)
Fly.io (Docker containers)
Railway (managed containers)
AWS (ECS, Lambda, CodeDeploy)
GitHub Pages (static hosting)

Output: Configured .env, CI/CD files, deploy scripts.Khi dùng: New project, migrate to new platform, first-time ship.

/ghpm — GitHub project management

Prefix: /ghpmOrganize GitHub issues, PRs, project board:

/ghpm

Actions:

Auto-label issues by type (bug, feature, enhancement)
Move issues on kanban board
Create milestones + track velocity
Assign reviewers for PRs
Track handoff status
Generate project summary

Output: Updated GitHub project board + labels + assignments.Khi dùng: Organize team workflow, track sprint progress, handoff coordination.

/worktree — Parallel development in isolation

Prefix: /worktree (already documented above, included for completeness)Create isolated git worktree for parallel development:

/worktree
# or with name
/worktree feat-payment-integration

Benefits:

Multiple Claude Code sessions on same repo
Independent branches, no conflicts
Automatic cleanup when done

Khi dùng: Multiple tasks in parallel, monorepo development.

​Git & Ship — Quản lý code và deploy

​Cú pháp

​Bảng tham chiếu nhanh

​/git — Git operations

​/worktree — Parallel development

​Cách dùng

​Lifecycle

​File .worktreeinclude

​Use case cho project

​/ship — Ship pipeline với release tags

​/land-and-deploy — Merge + Deploy + Monitor

​/canary — Post-deploy monitoring

​/setup-deploy — Config deploy platform

​/ghpm — GitHub project management

​Branch naming convention

​Khi nào dùng / không dùng

​Chi tiết lệnh Git & Ship (Accordion)

Git & Ship — Quản lý code và deploy

Cú pháp

Bảng tham chiếu nhanh

/git — Git operations

/worktree — Parallel development

Cách dùng

Lifecycle

File `.worktreeinclude`

Use case cho project

/ship — Ship pipeline với release tags

/land-and-deploy — Merge + Deploy + Monitor

/canary — Post-deploy monitoring

/setup-deploy — Config deploy platform

/ghpm — GitHub project management

Branch naming convention

Khi nào dùng / không dùng

Chi tiết lệnh Git & Ship (Accordion)