Edit

GitConflictDeleteRename Class

Definition

Data object for RenameDelete conflict

[System.Runtime.Serialization.DataContract]
public class GitConflictDeleteRename : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict
type GitConflictDeleteRename = class
    inherit GitConflict
Public Class GitConflictDeleteRename
Inherits GitConflict
Inheritance
Attributes

Remarks

Resolve with GitResolutionPickOneAction

Constructors

GitConflictDeleteRename()

Properties

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)
TargetBlob
TargetNewPath
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)

Applies to