Git Merge

git checkout main # switch to target branch
git merge feature-branch # merge feature into main

git merge branch-name # fast-forward if possible
git merge --no-ff branch-name # always create merge commit

git merge --squash branch-name # combine all commits into one
git commit -m 'message' # commit squashed changes

# Edit conflicted files
git add filename # mark as resolved
git commit # complete merge
git merge --abort # abort merge

git mergetool # open merge tool
git diff --conflict=diff3 # show 3-way diff