Branches & Merging

# List all local branches (* = current branch)
git branch

# List all branches including remote
git branch -a

# Create a new branch
git branch feat/user-auth

# Switch to a branch (modern syntax)
git switch feat/user-auth

# Old syntax (still works)
git checkout feat/user-auth

# CREATE and switch in one command
git checkout -b feat/payment-flow
# Or modern:
git switch -c feat/payment-flow

# Delete a merged branch
git branch -d feat/user-auth

# Force delete (even if unmerged)
git branch -D feat/user-auth

# Rename current branch
git branch -m new-name

# 1. Switch to the branch you want to merge INTO
git switch main

# 2. Merge the feature branch into main
git merge feat/user-auth

# 3. Delete the feature branch (optional, keeps things clean)
git branch -d feat/user-auth

# Git puts conflict markers in the file:

<<<<<<< HEAD
const greeting = "Hello";   # Your version (main)
=======
const greeting = "Hi there"; # Their version (feature branch)
>>>>>>> feat/update-greeting

# TO RESOLVE:
# 1. Delete ALL conflict markers (<<<, ===, >>>)
# 2. Keep whichever version you want (or combine them)
# 3. Save the file

# After resolving all conflicts:
git add .
git commit -m "merge: resolve conflict in greeting message"

# Stash current uncommitted changes
git stash

# Stash with a description
git stash push -m "WIP: half-done login form"

# List all stashes
git stash list

# Apply most recent stash (keeps it in list)
git stash apply

# Apply AND remove from list
git stash pop

# Apply a specific stash
git stash apply stash@{2}

# Delete a stash
git stash drop stash@{0}