Edit

GitConflictRename1to2 Class

Definition

Data object for Rename1to2 conflict

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

Remarks

Resolve with GitResolutionRename1to2

Constructors

GitConflictRename1to2()

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
SourceNewPath
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