git merge

Integrates changes from another branch into the current branch. Creates a merge commit unless fast-forward is possible.

Syntax

git

git merge <branch>
git merge --no-ff <branch>

Example

git

git checkout main
git merge feature/auth          # merge into main
git merge --no-ff feature/auth  # force merge commit
git merge --squash feature/auth # squash all commits into one