GitConflict Class
Definition
Important
Some information relates to prerelease product that may be substantially modified before it’s released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
[System.Runtime.Serialization.DataContract]
public class GitConflict : Microsoft.TeamFoundation.SourceControl.WebApi.VersionControlSecuredObject[System.Runtime.Serialization.DataContract]
[Newtonsoft.Json.JsonConverter(typeof(Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictJsonConverter))]
public class GitConflict : Microsoft.TeamFoundation.SourceControl.WebApi.VersionControlSecuredObjecttype GitConflict = class
inherit VersionControlSecuredObjectPublic Class GitConflict
Inherits VersionControlSecuredObject- Inheritance
- Derived
- Attributes
-
DataContractAttribute Newtonsoft.Json.JsonConverterAttribute
Constructors
| GitConflict() |
Properties
| ConflictId | |
| ConflictPath | |
| ConflictType | |
| Links | |
| MergeBaseCommit | |
| MergeOrigin | |
| MergeSourceCommit | |
| MergeTargetCommit | |
| ResolutionError | |
| ResolutionStatus | |
| ResolvedBy | |
| ResolvedDate | |
| Url |
Methods
| SetSecuredObject(ISecuredObject) |
Explicit Interface Implementations
| ISecuredObject.GetToken() | (Inherited from VersionControlSecuredObject) |
| ISecuredObject.NamespaceId | (Inherited from VersionControlSecuredObject) |
| ISecuredObject.RequiredPermissions | (Inherited from VersionControlSecuredObject) |