Overview If one branch adds a file and another branch modifies a different file, Git can often combine the changes automatically. After the merge, the destination branch contains both sets of work.