Related

List/Create Branches

git

List, create, or delete branches

Switch Branches

git

Switch branches or restore files

Switch Branches (New)

git

Switch branches (Git 2.23+)

git/merge

Merge Branches

Join two or more development histories together

git
merge
branch

Command

git merge

Explanation

git merge is used to join two or more development histories together. It joins two or more development histories together.

Examples

Merge feature branch into current

git merge feature

Create merge commit even if fast-forward possible

git merge --no-ff feature

More

Rebase Branch

git

Reapply commits on top of another base tip

Reference Log

git

Record when the tips of branches were updated

Rewrite History

git

Rewrite branches to filter out some files or modify commits