<type>[(scope)][!]: <description>

[optional body]

[optional footer(s)]

# Simple feature
git commit -m "feat: add dark mode toggle"

# Feature with scope
git commit -m "feat(ui): add settings page"

# Bug fix with issue reference
git commit -m "fix(auth): resolve login timeout" -m "" -m "Fixes #123"

# Breaking change
git commit -m "feat!: redesign API response format" -m "" -m "BREAKING CHANGE: all responses now use snake_case"

# Documentation
git commit -m "docs: update API documentation"

# Chore with scope
git commit -m "chore(deps): update dependencies"

# Multiple footers
git commit -m "feat(payments): implement Stripe integration" -m "" -m "Closes #100" -m "Reviewed-by: Alice <[email protected]>"

# 1. Create feature branch
git checkout -b feat/user-profile

# 2. Make changes and stage them
git add -A

# 3. Create conventional commit
git commit -m "feat(users): add profile page" -m "" -m "Implement user profile with avatar upload and bio editing."

# 4. Push to remote with upstream tracking
git push -u origin feat/user-profile

# 5. Create pull request
gh pr create --title "feat(users): add profile page" --body "## Summary
- Add user profile page with avatar upload
- Implement bio editing functionality

## Test Plan
- [ ] Test avatar upload with various file types
- [ ] Verify bio saves correctly"

# 1. Create fix branch
git checkout -b fix/login-timeout

# 2. Make changes and stage
git add -A

# 3. Create fix commit with issue reference
git commit -m "fix(auth): resolve login timeout issue" -m "" -m "Increase session timeout from 5 to 30 minutes." -m "" -m "Fixes #456"

# 4. Push and create PR
git push -u origin fix/login-timeout
gh pr create --title "fix(auth): resolve login timeout issue" --body "## Summary
- Fix session timeout causing premature logouts

## Test Plan
- [ ] Verify sessions persist for 30 minutes
- [ ] Test remember me functionality

Fixes #456"

# 1. Review PR changes
gh pr view 123
gh pr diff 123

# 2. Check if CI passes
gh pr checks 123

# 3. Approve PR
gh pr review 123 --approve --body "LGTM! Code looks clean and tests pass."

# 4. Merge with squash and delete branch
gh pr merge 123 --squash --delete-branch

# 1. Create hotfix branch from main
git checkout main
git pull origin main
git checkout -b hotfix/critical-security-fix

# 2. Make fix and commit
git add -A
git commit -m "fix(security): patch XSS vulnerability" -m "" -m "Sanitize user input in comment rendering." -m "" -m "Security: CVE-2024-1234"

# 3. Push and create urgent PR
git push -u origin hotfix/critical-security-fix
gh pr create --title "fix(security): patch XSS vulnerability" --body "## URGENT: Security Fix

Patches critical XSS vulnerability in comment rendering.

CVE: CVE-2024-1234

## Test Plan
- [ ] Verify malicious scripts are sanitized
- [ ] Test comment rendering still works"

# 4. Fast-track review and merge
gh pr merge <number> --squash --delete-branch

# 1. Fetch latest changes
git fetch origin main

# 2. Rebase current branch on main
git rebase origin/main

# 3. Resolve conflicts if any, then continue
git add -A
git rebase --continue

# 4. Force push (with lease for safety)
git push --force-with-lease

# 1. Create branch and make initial changes
git checkout -b feat/experimental-feature
git add -A
git commit -m "feat: add experimental feature (WIP)"

# 2. Push and create draft PR for early feedback
git push -u origin feat/experimental-feature
gh pr create --title "feat: add experimental feature" --body "WIP - seeking early feedback" --draft

# 3. Continue development, push updates
git add -A
git commit -m "feat: complete experimental feature"
git push

# 4. Mark ready for review when done
gh pr ready <number>

# Check GitHub CLI auth status
gh auth status

# Re-authenticate if needed
gh auth login

# Check SSH key
ssh -T [email protected]

# If behind remote, pull and rebase
git pull --rebase origin <branch>

# Then push
git push

# If after intentional rebase, force push (with lease)
git push --force-with-lease

# Fetch and rebase
git fetch origin main
git rebase origin/main

# After resolving conflicts in each file
git add <resolved-file>
git rebase --continue

# If you want to abort
git rebase --abort

# Fix the issues reported by hooks, then
git add -A
git commit -m "your message"

# Skip hooks only if absolutely necessary (not recommended)
git commit --no-verify -m "your message"

# Stash current changes
git stash

# Switch to correct branch
git checkout <correct-branch>

# Apply stashed changes
git stash pop

# Undo last commit but keep changes staged
git reset --soft HEAD~1

# Undo last commit and unstage changes
git reset HEAD~1