GitConflictAddAdd 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 AddAdd conflict
[System.Runtime.Serialization.DataContract]
public class GitConflictAddAdd : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflicttype GitConflictAddAdd = class
inherit GitConflictPublic Class GitConflictAddAdd
Inherits GitConflict- Inheritance
- Attributes
Remarks
Resolve with GitResolutionContentMerge
Constructors
| GitConflictAddAdd() |
Properties
| 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 | |
| TargetBlob | |
| Url | (Inherited from GitConflict) |
Methods
| SetSecuredObject(ISecuredObject) |
Explicit Interface Implementations
| ISecuredObject.GetToken() | (Inherited from VersionControlSecuredObject) |
| ISecuredObject.NamespaceId | (Inherited from VersionControlSecuredObject) |
| ISecuredObject.RequiredPermissions | (Inherited from VersionControlSecuredObject) |