Edit

GitConflictRename2to1 Class

Definition

Data object for Rename2to1 conflict

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

Remarks

Resolve with GitResolutionPathConflict

Constructors

GitConflictRename2to1()

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)
SourceNewBlob
SourceOriginalBlob
SourceOriginalPath
TargetNewBlob
TargetOriginalBlob
TargetOriginalPath
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