Automatic Merge File changes that don’t involve conflicts are automatically merged. Figure 1 illustrates a comparison of two versions of a single file where there are no conflicts. Figure 2 shows the conflict resolution dialog that appears when there are conflicts in file check-in. Choosing “Auto Merge All” in this dialog tells Team Foundation Server to automatically merge differences between the files. Only if there is a conflicting change will Team Foundation Server prompt for user input; otherwise, all changes are seamlessly integrated. Automatic merges help teams who are working in parallel to integrate batches of changes together quickly and easily. Figure 1 - Non-conflicting changes   Figure 2 - Using Auto Merge All