# Create and switch to new branch
git switch -c feature/login         # modern syntax (Git 2.23+)
git checkout -b feature/login        # classic equivalent

# List branches
git branch                           # local
git branch -r                        # remote
git branch -a                        # all

# Switch branches
git switch main
git checkout main                    # classic

# Delete branches
git branch -d feature/done           # safe delete (checks merged)
git branch -D feature/abandon        # force delete
git push origin --delete feature/done  # delete remote branch

# Feature branch has no divergence from main
git switch main
git merge feature/login       # just moves the pointer forward, no merge commit
git merge --no-ff feature/login   # force merge commit even if FF possible

# Both branches have new commits — creates a merge commit
git switch main
git merge feature/login
# Result: M---*   (merge commit combining both histories)

# Condense all feature commits into one commit on main
git switch main
git merge --squash feature/login
git commit -m "feat: add user authentication"
# Feature branch commits disappear from main history

# Rebase feature branch onto main (move feature's base to main's tip)
git switch feature/login
git rebase main

# Interactive rebase — rewrite last 5 commits
git rebase -i HEAD~5
# Editor opens with pick/squash/edit/reword/drop commands

# After conflict, Git marks files:
<<<<<<< HEAD
current branch content
=======
incoming branch content
>>>>>>> feature/login

# 1. Edit files to resolve
# 2. Stage resolved files
git add src/auth.js

# 3. Continue merge or rebase
git merge --continue        # for merge
git rebase --continue       # for rebase

# Abort if needed
git merge --abort
git rebase --abort

git mergetool                  # opens configured visual tool
git config --global merge.tool vscode
git config --global mergetool.vscode.cmd 'code --wait $MERGED'

# Fetch remote changes (no merge)
git fetch origin

# Pull = fetch + merge
git pull origin main

# Pull with rebase (keeps history linear)
git pull --rebase origin main
git config --global pull.rebase true     # make this the default

# Push feature branch
git push -u origin feature/login         # -u sets upstream tracking
git push                                  # subsequent pushes
git push --force-with-lease              # safe force push (rebase workflow)

# Apply a specific commit from another branch
git cherry-pick abc1234

# Apply a range of commits
git cherry-pick abc1234..def5678

# Pick without committing (stage only)
git cherry-pick -n abc1234

# See which branches are merged into main
git branch --merged main

# Find commit that introduced a bug (binary search)
git bisect start
git bisect bad                   # current commit is bad
git bisect good v1.0             # v1.0 was good
# Git checks out midpoint; test and mark good/bad
git bisect good
git bisect bad
git bisect reset                 # when done

# Compare two branches
git diff main..feature/login
git log main..feature/login --oneline