How to Use Git: Core Workflows

Working tree  →  git add  →  Staging area  →  git commit  →  Repository
(edited files)                 (index)                          (.git/objects)

Fix login redirect after password reset

After a successful password reset the user was redirected to /dashboard
instead of /login. The auth middleware was reading the stale session
before the session cookie was cleared.

Fixes #347

git switch -c feature/add-csv-export  # create and switch

# ... make commits ...

git switch main
git merge --no-ff feature/add-csv-export  # preserve merge commit
git branch -d feature/add-csv-export

# Merge (preserves history, safe for shared branches)
git switch main
git merge feature/my-feature

# Rebase (linear history, only on local/private branches)
git switch feature/my-feature
git rebase main  # replays feature commits on top of main
git switch main
git merge feature/my-feature  # now a fast-forward

<<<<<<< HEAD
const timeout = 5000;    ← your version
=======
const timeout = 10000;   ← incoming version
>>>>>>> feature/longer-timeout

# 1. Edit the file to the correct version:
const timeout = 10000;

# 2. Stage the resolved file
git add src/config.js

# 3. Finish the merge
git commit

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

# Undo last commit and unstage changes (keep files)
git reset --mixed HEAD~1

# Discard uncommitted changes to a file
git restore src/file.js

# Create a new commit that reverses a past commit (safe for shared branches)
git revert <commit-hash>

# Find a commit that introduced a bug
git bisect start
git bisect bad          # current commit is broken
git bisect good v1.2.0  # this version was fine
# Git checks out midpoints; mark each as good/bad until it finds the culprit