Edit

GitConflictRenameRename Class

Definition

Data object for RenameRename conflict

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

Remarks

Resolve with GitResolutionContentMerge

Constructors

GitConflictRenameRename()

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)
OriginalPath
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)

Applies to