merge

Also written: merging

Combining one branch's commits into another. Merge from the branch that is receiving the work.