Resolving Conflicts

Conflict is a result of discrepancy between the latest version of an object in source control and the one in local database. The most common reason of conflicts is that multiple people were modifying it simultaneously.

Conflicts are displayed in the corresponding section of Source Control Manager.

To resolve conflicts:

  1. In Database Explorer, right-click a linked database or a specific database object.
  2. Point to Source Control Tasks, and then click Show Source Control Manager on the shortcut menu. Source Control Manager opens.

    Conflicts

  3. Select conflicted objects.
  4. Select how you want to resolve conflicts:
    • Get Local - your version of an object will be committed to source control.
    • Get Remote - your changes will be discarded. The local database will be updated with the latest version of an object from source control.