merge

Also known as integration, merge operation, merging, version control merge, revision control merge, VCS merge, merging a branch

fundamental version-control operation that reconciles the changes made in independent branches