{type}/{ticket-id}-{short-description}

{type}({scope}): {description}
 
{body - optional}
 
{footer - optional}

# Simple commit
git commit -m "feat(auth): add JWT token validation"
 
# With body
git commit -m "fix(api): handle null user in response
 
The API was returning 500 when user was not found.
Now returns 404 with proper error message.
 
Fixes TKT-456"
 
# Breaking change
git commit -m "feat(api)!: change response format to JSON:API
 
BREAKING CHANGE: Response format changed from custom to JSON:API spec.
Migration guide: docs/migration/v2-response-format.md"

# Create feature branch from main
git checkout main
git pull origin main
git checkout -b feature/TKT-123-feature-name
 
# Or from develop for GitFlow
git checkout develop
git pull origin develop
git checkout -b feature/TKT-123-feature-name

# Stage and commit changes
git add -A
git commit -m "feat(scope): description"
 
# Keep branch updated
git fetch origin
git rebase origin/main  # or origin/develop

# Ensure clean history
git rebase -i HEAD~{n}  # Squash if needed
 
# Push to remote
git push -u origin feature/TKT-123-feature-name

{type}({scope}): {description} [TKT-{num}]

## Summary
{1-2 sentence description of changes}
 
## Changes
-{Change 1}
-{Change 2}
 
## Testing
-[ ] Unit tests pass
-[ ] Integration tests pass
-[ ] Manual testing completed
 
## Ticket
Closes TKT-{num}
 
## Screenshots (if UI changes)
{Add screenshots}

git add -A
git commit --amend --no-edit
git push --force-with-lease

git reset --soft HEAD~1

git checkout target-branch
git cherry-pick {commit-hash}

git fetch -p
git branch --merged | grep -v main | xargs git branch -d

# First push (set upstream)
git push -u origin feature/TKT-123-feature-name
 
# Subsequent pushes
git push
 
# Force push (only on your own branches, never main!)
git push --force-with-lease

# Stage, commit, push in one flow
git add -A
git commit -m "feat(scope): description"
git push

# Create PR with title and body
gh pr create --title "feat(auth): add login feature [TKT-123]" --body "## Summary
Implements user login with JWT authentication.
 
## Changes
- Add login endpoint
- Add JWT token generation
- Add auth middleware
 
## Testing
- [x] Unit tests pass
- [x] Integration tests pass
 
Closes TKT-123"
 
# Create PR interactively
gh pr create
 
# Create draft PR
gh pr create --draft
 
# Create PR with reviewers
gh pr create --reviewer @username1,@username2

# View PR status and checks
gh pr status
gh pr checks
 
# View specific PR
gh pr view 123

# Squash merge (recommended - clean history)
gh pr merge --squash
 
# Regular merge
gh pr merge --merge
 
# Rebase merge
gh pr merge --rebase
 
# Merge specific PR number
gh pr merge 123 --squash
 
# Merge with custom commit message
gh pr merge --squash --subject "feat(auth): implement login [TKT-123]"
 
# Auto-merge when checks pass
gh pr merge --auto --squash

# 1. Ensure all tests pass
gh pr checks
 
# 2. Ensure PR is approved (if required)
gh pr view --json reviews
 
# 3. Merge the PR
gh pr merge --squash --delete-branch
 
# The --delete-branch flag cleans up the feature branch after merge

# Switch back to main and pull latest
git checkout main
git pull origin main
 
# Clean up local branches
git fetch -p
git branch --merged | grep -v main | xargs git branch -d

# Update your branch with main
git fetch origin
git rebase origin/main
 
# If conflicts occur:
# 1. Fix conflicts in files
# 2. Stage resolved files
git add <resolved-files>
# 3. Continue rebase
git rebase --continue
# 4. Force push (safe on feature branches)
git push --force-with-lease