Edit

GitConflictRenameAdd Class

Definition

Data object for AddRename conflict

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

Remarks

Resolve with GitResolutionPathConflict

Constructors

GitConflictRenameAdd()

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)
SourceBlob
SourceOriginalPath
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)

Applies to