Branching and Merging

git branch                      # list local branches (* marks current)
git branch -a                   # include remote-tracking branches
git branch -vv                  # show upstream and last commit per branch
git switch -c feature           # create AND switch to a new branch
git switch main                 # switch to an existing branch
git switch -                    # jump back to the previous branch
git switch -c hotfix abc1234    # branch off a specific commit
git checkout -b feature         # legacy equivalent of switch -c

git stash                       # stash tracked changes
git stash -u                    # include untracked files
git stash push -m "wip: login"  # stash with a label
git stash list                  # stash@{0} is the newest
git stash pop                   # re-apply newest stash and drop it
git stash apply stash@{2}       # re-apply a specific stash, keep it
git stash show -p stash@{0}     # inspect a stash as a diff
git stash drop stash@{0}        # delete one
git stash branch fix-login stash@{0}   # turn a stash into a branch

git switch main             # go to the branch you want to merge INTO
git merge feature           # bring feature's commits into main
git merge --no-ff feature   # force a merge commit even when fast-forward is possible
git merge --squash feature  # collapse the whole branch into one staged change
git merge --abort           # bail out of a conflicted merge

<<<<<<< HEAD
your version (current branch)
=======
their version (branch being merged)
>>>>>>> feature

git status                          # lists "both modified" files
# edit each file, keep what you want, delete the <<< === >>> markers
git checkout --ours  path/file.txt  # or take YOUR side wholesale
git checkout --theirs path/file.txt # or take THEIR side wholesale
git add path/file.txt               # mark it resolved
git merge --continue                # finish the merge (or: git commit)
git merge --abort                   # or give up and restore pre-merge state

git switch feature
git rebase main                 # replay feature's commits onto main
git rebase --continue           # after fixing a conflict
git rebase --abort              # give up, return to pre-rebase state

git rebase -i HEAD~3            # edit the last 3 commits
git commit --fixup abc1234      # mark a commit as a fix for an older one
git rebase -i --autosquash main # auto-arrange fixup commits

git cherry-pick abc1234             # apply one commit here
git cherry-pick abc1234 def5678     # several
git cherry-pick abc1234^..def5678   # an inclusive range
git cherry-pick -x abc1234          # append "(cherry picked from ...)" to the message
git cherry-pick -n abc1234          # apply to working tree without committing
git cherry-pick --abort             # bail out of a conflicted pick

git branch -m old new               # rename a branch
git branch -d feature               # delete a merged local branch
git branch -D feature               # force-delete an unmerged branch
git push origin --delete feature    # delete the branch on the remote
git fetch --prune                   # drop local refs to deleted remote branches