Git Workflow

# Good: descriptive, kebab-case
feature/add-user-registration
bugfix/fix-password-reset-email
hotfix/patch-sql-injection

# Bad: vague, inconsistent
feature/stuff
fix1
john-branch

<type>[optional scope]: <description>

[optional body]

[optional footer(s)]

# Feature with scope
feat(auth): add password reset functionality

Implement password reset flow with email verification.
- Add password reset request endpoint
- Add email template for reset link
- Add token validation and password update

Closes #123

# Breaking change
feat(api)!: change response format for user endpoint

BREAKING CHANGE: The user endpoint now returns a nested
data object instead of flat properties.

# Bug fix
fix(validation): handle empty email in registration form

Previously, submitting an empty email would cause a 500 error.
Now returns a proper validation message.

Fixes #456

# Install Husky
npm install --save-dev husky

# Initialize Husky
npx husky init

# Add pre-commit hook
echo "npx lint-staged" > .husky/pre-commit

{
  "lint-staged": {
    "*.{js,ts,jsx,tsx}": [
      "eslint --fix",
      "prettier --write"
    ],
    "*.{json,md,yml,yaml}": [
      "prettier --write"
    ],
    "*.py": [
      "black",
      "ruff check --fix"
    ]
  }
}

# Install commitlint
npm install --save-dev @commitlint/cli @commitlint/config-conventional

# Create commitlint.config.js
echo "module.exports = { extends: ['@commitlint/config-conventional'] };" > commitlint.config.js

# Add commit-msg hook
echo "npx --no -- commitlint --edit \$1" > .husky/commit-msg

feat(auth): add social login support
fix(api): handle rate limiting correctly
docs: update installation instructions

## Summary
Brief description of changes.

## Changes
- Added X
- Modified Y
- Removed Z

## Testing
- [ ] Unit tests added/updated
- [ ] Integration tests pass
- [ ] Manual testing performed

## Screenshots (if applicable)
[Add screenshots for UI changes]

## Related Issues
Closes #123

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

# Switch branches
git checkout main

# Delete local branch
git branch -d feature/old-feature

# Delete remote branch
git push origin --delete feature/old-feature

# List all branches
git branch -a

# Fetch and rebase (preferred for feature branches)
git fetch origin
git rebase origin/main

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

# Pull with rebase
git pull --rebase origin main

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

# Undo last commit (keep changes unstaged)
git reset HEAD~1

# Discard all local changes
git reset --hard HEAD

# Revert a specific commit (creates new commit)
git revert <commit-hash>