Note
Access to this page requires authorization. You can try signing in or changing directories.
Access to this page requires authorization. You can try changing directories.
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)
Syntax
'Declaration
Public Enumeration Resolution
'Usage
Dim instance As Resolution
public enum Resolution
public enum class Resolution
public enum Resolution
Members
| Member name | Description | |
|---|---|---|
| None | ||
| AcceptMerge | ||
| AcceptYours | ||
| AcceptTheirs | ||
| DeleteConflict | ||
| AcceptYoursRenameTheirs | ||
| OverwriteLocal | This resolution is only used on the client. |