pull-request

1. Create feature branch from main
2. Make changes + commit
3. Push to remote
4. Create pull request
5. Code review
6. Merge to main

# Feature branches
feature/add-product-filter
feature/inventory-alerts

# Bug fixes
fix/product-validation
fix/order-stock-deduction

# Improvements
improve/api-error-handling
improve/ui-responsiveness

# Documentation
docs/api-endpoints
docs/setup-guide

# Format: <type>(<scope>): <description>

# Good commits
feat(products): add image upload endpoint
fix(orders): prevent negative stock
docs(readme): update setup instructions
style(ui): improve button spacing
refactor(api): extract validation logic
test(orders): add stock deduction tests

# Bad commits
update stuff
fix bug
changes
wip

## Description

Brief description of what this PR does.

## Type of Change

- [ ] New feature
- [ ] Bug fix
- [ ] Documentation
- [ ] Refactoring
- [ ] Testing

## Changes Made

- Added product image upload
- Updated validation logic
- Fixed stock deduction bug

## Testing

- [ ] Tested locally
- [ ] Unit tests pass
- [ ] E2E tests pass
- [ ] Tested on mobile

## Screenshots (if UI changes)

![Screenshot](url)

## Checklist

- [ ] Code follows project style
- [ ] Self-reviewed code
- [ ] Commented complex logic
- [ ] Updated documentation
- [ ] No console errors

# Create and switch to new branch
git checkout -b feature/my-feature

# Stage changes
git add .

# Commit with message
git commit -m "feat(products): add filter by category"

# Push to remote
git push origin feature/my-feature

# Create PR (using GitHub CLI)
gh pr create --title "Add product filter" --body "..."

# Update branch with main
git checkout main
git pull origin main
git checkout feature/my-feature
git merge main

# Alternative: rebase
git rebase main

# Squash commits before merge
git rebase -i HEAD~3

# Suggest improvement
**Suggestion:** Extract this logic into a separate function

# Request change
**Change needed:** Add error handling for this API call

# Ask question
**Question:** Why did we choose this approach?

# Approve with nit
**LGTM** (Looks Good To Me) with minor nit: rename variable

# Request tests
**Tests:** Can you add tests for this edge case?

# Squash and merge (preferred for feature branches)
# Combines all commits into one
git merge --squash feature/my-feature

# Regular merge (for release branches)
git merge feature/my-feature

# Rebase and merge (clean history)
git rebase main
git checkout main
git merge feature/my-feature

# When merge conflicts occur
git merge main
# Fix conflicts in files
git add .
git commit -m "Merge main into feature"
git push

# Using VS Code
# 1. Open conflicted file
# 2. Choose: Accept Current | Accept Incoming | Accept Both
# 3. Save and commit

# Create branch
git checkout -b feature/name

# Commit
git add .
git commit -m "feat: description"

# Push
git push origin feature/name

# Create PR (GitHub CLI)
gh pr create

# View PRs
gh pr list

# Checkout PR locally
gh pr checkout 123

# Merge PR
gh pr merge 123 --squash