merge
fundamental operation that reconciles the changes made to two independent branches of a file into a single set of files that contains both sets of changes
--Agreed Upon Solutions

The discussion does not exist would you like to add the first comment?

anonymous