These are the different ways to resolve a conflict.
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in microsoft.teamfoundation.versioncontrol.client.dll)
Visual Basic (Declaration)
Public Enumeration Resolution
Dim instance As Resolution
public enum class Resolution
| | Member name | Description |
|---|
| AcceptMerge | |
| AcceptTheirs | |
| AcceptYours | |
| AcceptYoursRenameTheirs | |
| DeleteConflict | |
| None | |
| OverwriteLocal | This resolution is only used on the client. |