Git & GitHub

# Identity — used in every commit you make
git config --global user.name "Rishabh Ranjan"
git config --global user.email "rishabh@example.com"

# Sensible defaults
git config --global init.defaultBranch main
git config --global pull.rebase true     # rebase on pull instead of merge
git config --global core.autocrlf input  # Mac/Linux: normalize line endings

# Useful aliases for SDETs
git config --global alias.lg "log --oneline --graph --decorate --all"
git config --global alias.st "status -sb"

# Node / Playwright
node_modules/
playwright-report/
test-results/
.env
*.mp4
*.zip

# Java / Maven
target/
*.class
*.jar
surefire-reports/

# IDE files
.idea/
.vscode/
*.iml

# OS
.DS_Store
Thumbs.db

# Create and switch to a new feature branch
git switch -c feature/add-login-tests

# List all branches (local + remote)
git branch -a

# Merge feature into main (creates a merge commit)
git switch main
git merge --no-ff feature/add-login-tests

# Rebase feature on top of main (clean linear history)
git switch feature/add-login-tests
git rebase main

# Delete a merged branch
git branch -d feature/add-login-tests

# Push branch to remote and track it
git push -u origin feature/add-login-tests

# Git marks conflicts in files like this:
<<<<<<< HEAD
  const timeout = 30000;  // original
=======
  const timeout = 60000;  // incoming change
>>>>>>> feature/slow-networks

# 1. Edit the file to keep the right version
# 2. Stage the resolved file
git add playwright.config.ts

# 3. Complete the merge
git merge --continue   # Modern, recommended approach
# OR
git commit             # Traditional workflow (both approaches are valid)

# Use a visual merge tool
git mergetool    # opens configured diff tool (VSCode, IntelliJ, etc.)

# Fetch all remote changes without merging
git fetch --prune   # --prune removes stale remote-tracking refs

# Pull with rebase (cleaner than merge pull)
git pull --rebase origin main

# Check out a PR locally for review/testing
# Note: pull/42/head is GitHub-specific and may not work on GitLab, Bitbucket, or Azure DevOps
git fetch origin pull/42/head:pr-42
git switch pr-42

# Tag a release
git tag -a v1.3.0 -m "Release 1.3.0 — adds API test suite"
git push origin v1.3.0

# Cherry-pick a specific commit to hotfix branch
git cherry-pick a3f8c2d

# If cherry-pick encounters conflicts:
# 1. Resolve conflicts in files manually
git add <resolved-file>
git cherry-pick --continue

# Or abort the cherry-pick completely:
git cherry-pick --abort

# Force-update a fork with upstream changes
git remote add upstream https://github.com/org/repo.git
git fetch upstream
git rebase upstream/main

name: Playwright E2E Tests

on:
  push:
    branches: [main, develop]
  pull_request:
    branches: [main]

jobs:
  test:
    runs-on: ubuntu-latest
    strategy:
      matrix:
        shard: [1, 2, 3]  # parallel sharding

    steps:
      - uses: actions/checkout@v4

      - uses: actions/setup-node@v4
        with:
          node-version: "20"
          cache: "npm"

      - name: Install dependencies
        run: npm ci

      - name: Install Playwright browsers
        run: npx playwright install --with-deps chromium

      - name: Run Playwright tests
        run: npx playwright test --shard=${{ matrix.shard }}/3
        env:
          BASE_URL: ${{ secrets.STAGING_URL }}
          API_KEY: ${{ secrets.API_KEY }}

      - name: Upload test report
        uses: actions/upload-artifact@v4
        if: always()   # upload even on failure
        with:
          name: playwright-report-shard-${{ matrix.shard }}
          path: playwright-report/
          retention-days: 14

# Cache node_modules — saves ~40s on each run
- name: Cache Playwright binaries
  uses: actions/cache@v4
  with:
    path: ~/.cache/ms-playwright
    key: playwright-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
    restore-keys: playwright-${{ runner.os }}-

# Start bisect session
git bisect start

# Tell git the current commit is broken
git bisect bad

# Tell git a known-good commit (a week ago, perhaps)
git bisect good v1.2.0

# Git checks out a middle commit — run your test:
npm test -- --grep "login flow"

# Mark result and git moves to next midpoint
git bisect good    # or: git bisect bad

# After a few rounds, git prints the culprit commit:
# a3f8c2d is the first bad commit
# commit a3f8c2d  — "refactor: update timeout values"

# End the bisect session
git bisect reset

# Automate bisect with a test script (fully hands-free)
git bisect run npm test -- --grep "login flow"

# Tag a stable test suite release (use semantic versioning)
git tag -a test-suite-v2.4.0 -m "Stable: 240 specs, 0 flaky, Playwright 1.44"
git push origin test-suite-v2.4.0

# List all test-suite tags
git tag -l "test-suite-*"

# Roll back to a stable release if new changes break CI
git checkout test-suite-v2.3.0

# Compare what changed between two stable tags
git diff test-suite-v2.3.0..test-suite-v2.4.0 --stat

# Squash last 4 commits into one clean commit before PR
git rebase -i HEAD~4

# In the editor that opens:
pick a1b2c3d test: add login spec
squash d4e5f6a test: fix typo in spec
squash 7g8h9i0 test: remove debug log
squash j1k2l3m test: update assertion

# Result: one clean commit "test: add login spec with assertions"
# This makes code review much easier for reviewers

# 1. Initialize Husky in your test project
npx husky init

# 2. Add a lint or formatting gate to pre-commit hook (.husky/pre-commit)
echo "npm run lint" > .husky/pre-commit

# 3. Add a fast smoke-test gate before pushing (.husky/pre-push)
echo "npx playwright test --project=chromium --grep @smoke" > .husky/pre-push

# Now, if linting fails or smoke tests break, Git aborts the commit/push automatically!

# --- SCENARIO A: Recovering lost commits after a bad hard reset ---
# View the log of all local HEAD pointer movements (even deleted commits)
git reflog

# Find the SHA before your accidental reset (e.g., HEAD@{1})
# HEAD@{0}: reset: moving to HEAD~1
# HEAD@{1}: commit: test: add API contract validation suite

# Hard-reset back to the lost commit to recover it fully
git reset --hard HEAD@{1}

# --- SCENARIO B: Handling a Detached HEAD state ---
# You checked out a tag or commit directly: HEAD points to SHA, not a branch
git checkout v2.4.0

# To save work/changes made in this state, spawn a branch from your current position
git switch -c feature/save-detached-work