Git - Collaboration Workflows

1. main branch is always deployable
2. Create feature branches from main
3. Push early and often
4. Open pull request when ready
5. Deploy from feature branch for testing
6. Merge to main after review
7. Deploy main immediately

# Always start from latest main
git switch main
git pull origin main

# Create descriptive feature branch
git switch -c feature/user-authentication

# Make meaningful commits
git add .
git commit -m "Add login form component"

git add .
git commit -m "Implement password validation"

# Push early for backup and visibility
git push -u origin feature/user-authentication

# Open PR via GitHub UI or CLI
gh pr create --title "Add user authentication" \
             --body "Implements login/logout with session management"

# Or push and follow GitHub's prompt
git push origin feature/user-authentication

# Deploy feature branch to staging
git push origin feature/user-authentication:staging

# After review approval, merge
gh pr merge --squash

# Delete feature branch after merge
git switch main
git pull origin main
git branch -d feature/user-authentication
git push origin --delete feature/user-authentication

main      → Production-ready code, tagged releases
develop   → Integration branch, latest development
feature/* → Individual features
release/* → Release preparation
hotfix/*  → Production fixes

# Install git-flow extensions (optional)
brew install git-flow-avh  # macOS
apt install git-flow       # Ubuntu

# Initialize GitFlow
git flow init

# Or manually create branches
git branch develop main

# Start feature (git-flow)
git flow feature start user-profile

# Or manually
git switch -c feature/user-profile develop

# Work on feature
git add .
git commit -m "Add profile model"

# Finish feature (git-flow)
git flow feature finish user-profile

# Or manually
git switch develop
git merge --no-ff feature/user-profile
git branch -d feature/user-profile

# Start release
git flow release start v1.2.0

# Or manually
git switch -c release/v1.2.0 develop

# Prepare release
git commit -m "Bump version to 1.2.0"

# Finish release
git flow release finish v1.2.0

# Or manually
git switch main
git merge --no-ff release/v1.2.0
git tag -a v1.2.0 -m "Release 1.2.0"
git switch develop  
git merge --no-ff release/v1.2.0
git branch -d release/v1.2.0

# Critical bug in production
git flow hotfix start critical-fix

# Or manually
git switch -c hotfix/critical-fix main

# Fix the bug
git commit -m "Fix critical security vulnerability"

# Finish hotfix
git flow hotfix finish critical-fix

# Or manually
git switch main
git merge --no-ff hotfix/critical-fix
git tag -a v1.2.1 -m "Hotfix 1.2.1"
git switch develop
git merge --no-ff hotfix/critical-fix
git branch -d hotfix/critical-fix

Title: [Feature] Add user authentication system

Description:
## What
Implements complete user authentication with login/logout functionality.

## Why  
Enables user-specific features and content personalization.

## How
- Added User model with password hashing
- Created login/logout endpoints  
- Implemented session management
- Added authentication middleware

## Testing
- Unit tests for User model
- Integration tests for auth endpoints
- Manual testing of login flow

## Screenshots
[Include screenshots of UI changes]

## Checklist
- [x] Tests added/updated
- [x] Documentation updated
- [x] No breaking changes
- [x] Follows coding standards

Code Quality:
- [ ] Code follows project conventions
- [ ] No code smells or anti-patterns
- [ ] Proper error handling
- [ ] No security vulnerabilities

Functionality:
- [ ] Features work as described
- [ ] Edge cases handled
- [ ] No regressions introduced
- [ ] Performance impact acceptable

Testing:
- [ ] Tests cover new functionality
- [ ] All tests pass
- [ ] Test quality is good
- [ ] Integration tests included

Documentation:
- [ ] README updated if needed
- [ ] API documentation updated
- [ ] Comments explain complex logic

# 1. Fork repository on GitHub

# 2. Clone your fork
git clone [email protected]:yourusername/project.git
cd project

# 3. Add upstream remote
git remote add upstream [email protected]:originalowner/project.git

# 4. Create feature branch
git switch -c feature/awesome-feature

# 5. Work and commit
git commit -m "Add awesome feature"

# 6. Push to your fork
git push origin feature/awesome-feature

# 7. Open pull request from your fork to upstream

# 8. Keep fork updated
git fetch upstream
git switch main
git merge upstream/main
git push origin main

# All team members have push access
git clone [email protected]:company/project.git

# Standard feature branch workflow
git switch main
git pull origin main
git switch -c feature/new-feature
# Work...
git push origin feature/new-feature
# Open PR
# Merge after review

DO:
✅ Be constructive and respectful
✅ Explain the "why" behind suggestions
✅ Acknowledge good code
✅ Focus on important issues first
✅ Test the changes locally if needed

DON'T:
❌ Be overly nitpicky about style
❌ Make personal attacks
❌ Block PRs for minor issues
❌ Approve without understanding
❌ Let PRs sit too long

# Keep feature branches short-lived
# Pull from main frequently
git switch feature-branch
git fetch origin
git rebase origin/main

# Communicate about overlapping work
# Use feature flags for incomplete features

# 1. Fetch latest changes
git fetch origin

# 2. Rebase your branch
git rebase origin/main

# 3. Resolve conflicts collaboratively
# - Talk to other developers
# - Understand both changes
# - Test combined result

# 4. Push resolved changes
git push --force-with-lease origin feature-branch

MAJOR: Breaking changes (v1.0.0 → v2.0.0)
MINOR: New features, backward compatible (v1.0.0 → v1.1.0)
PATCH: Bug fixes, backward compatible (v1.0.0 → v1.0.1)

Examples:
v1.0.0   → Initial release
v1.0.1   → Bug fix
v1.1.0   → New feature added
v2.0.0   → Breaking API changes

# 1. Create release branch
git switch -c release/v1.2.0 develop

# 2. Update version numbers
echo "1.2.0" > VERSION
git commit -m "Bump version to 1.2.0"

# 3. Generate changelog
git log --oneline v1.1.0..HEAD > CHANGELOG-1.2.0.md

# 4. Final testing and bug fixes
git commit -m "Fix release blocker bug"

# 5. Merge to main and tag
git switch main
git merge --no-ff release/v1.2.0
git tag -a v1.2.0 -m "Release version 1.2.0"

# 6. Deploy to production
git push origin main --tags

# 7. Merge back to develop
git switch develop
git merge --no-ff release/v1.2.0

type(scope): description

[optional body]

[optional footer]

Examples:
feat(auth): add login endpoint
fix(ui): resolve button alignment issue  
docs(api): update authentication guide
refactor(db): optimize user queries
test(auth): add integration tests

feature/JIRA-123-user-authentication
bugfix/issue-456-login-error
hotfix/security-patch-cve-2023-001
release/v1.2.0
experiment/new-ui-framework

#!/bin/sh
# .git/hooks/pre-commit

# Run linting
npm run lint
if [ $? -ne 0 ]; then
    echo "Lint failed. Commit aborted."
    exit 1
fi

# Run tests
npm test
if [ $? -ne 0 ]; then
    echo "Tests failed. Commit aborted."
    exit 1
fi

# .github/workflows/ci.yml
name: CI
on:
  pull_request:
    branches: [ main, develop ]
  push:
    branches: [ main ]

jobs:
  test:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
      - name: Setup Node.js
        uses: actions/setup-node@v3
        with:
          node-version: '18'
      - run: npm ci
      - run: npm test
      - run: npm run lint

# Solution: Use --force-with-lease
git push --force-with-lease origin feature-branch

# Recovery for affected team members:
git fetch origin
git reset --hard origin/feature-branch

# Solution: Use Git LFS
git lfs track "*.psd"
git lfs track "*.zip"
git add .gitattributes
git commit -m "Track large files with LFS"