Resolution-Enumeration
Diese sind die verschiedenen Möglichkeiten, einen Konflikt zu lösen.
Namespace: Microsoft.TeamFoundation.VersionControl.Server
Assembly: Microsoft.TeamFoundation.VersionControl.Server (in Microsoft.TeamFoundation.VersionControl.Server.dll)
Syntax
'Declaration
Public Enumeration Resolution
public enum Resolution
Member
Membername | Beschreibung | |
---|---|---|
AcceptMerge | ||
AcceptTheirs | ||
AcceptYours | ||
AcceptYoursRenameTheirs | ||
DeleteConflict | ||
None | ||
OverwriteLocal |