GitConflictEditDelete 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.
Data object for DeleteEdit conflict
[System.Runtime.Serialization.DataContract]
public class GitConflictEditDelete : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflicttype GitConflictEditDelete = class
inherit GitConflictPublic Class GitConflictEditDelete
Inherits GitConflict- Inheritance
- Attributes
Remarks
Resolve with GitResolutionPickOneAction
Constructors
| Name | Description |
|---|---|
| GitConflictEditDelete() | |
Properties
| Name | Description |
|---|---|
| BaseBlob | |
| ConflictId | (Inherited from GitConflict) |
| ConflictPath | (Inherited from GitConflict) |
| ConflictType | (Inherited from GitConflict) |
| Links | (Inherited from GitConflict) |
| MergeBaseCommit | (Inherited from GitConflict) |
| MergeOrigin | (Inherited from GitConflict) |
| MergeSourceCommit | (Inherited from GitConflict) |
| MergeTargetCommit | (Inherited from GitConflict) |
| Resolution | |
| ResolutionError | (Inherited from GitConflict) |
| ResolutionStatus | (Inherited from GitConflict) |
| ResolvedBy | (Inherited from GitConflict) |
| ResolvedDate | (Inherited from GitConflict) |
| SourceBlob | |
| Url | (Inherited from GitConflict) |
Methods
| Name | Description |
|---|---|
| SetSecuredObject(ISecuredObject) | |
Explicit Interface Implementations
| Name | Description |
|---|---|
| ISecuredObject.GetToken() | (Inherited from VersionControlSecuredObject) |
| ISecuredObject.NamespaceId | (Inherited from VersionControlSecuredObject) |
| ISecuredObject.RequiredPermissions | (Inherited from VersionControlSecuredObject) |