Merging Source Control Files

You can merge conflicting source control files in the following ways:

• Merging Source Control Files—Git
• Merging Source Control Files—Perforce Helix Core
• Merging Source Control Files—Subversion
• Merging Source Control Files—Team Foundation Server