Merge

Applies to: general

A merge combines changes from one branch into another. Conflicts happen when both branches changed the same lines.

git merge feature

See also: git, branch, pull-request