通过

GitConflict interface

包:
azure-devops-extension-api

属性

conflictId
conflictPath
conflictType
mergeBaseCommit
mergeOrigin
mergeSourceCommit
mergeTargetCommit
resolutionError
resolutionStatus
resolvedBy
resolvedDate
url

属性详细信息

conflictId 

conflictId: number

属性值

number

conflictPath 

conflictPath: string

属性值

string

conflictType 

conflictType: GitConflictType

属性值

GitConflictType

mergeBaseCommit 

mergeBaseCommit: GitCommitRef

属性值

GitCommitRef

mergeOrigin 

mergeOrigin: GitMergeOriginRef

属性值

GitMergeOriginRef

mergeSourceCommit 

mergeSourceCommit: GitCommitRef

属性值

GitCommitRef

mergeTargetCommit 

mergeTargetCommit: GitCommitRef

属性值

GitCommitRef

resolutionError 

resolutionError: GitResolutionError

属性值

GitResolutionError

resolutionStatus 

resolutionStatus: GitResolutionStatus

属性值

GitResolutionStatus

resolvedBy 

resolvedBy: IdentityRef

属性值

IdentityRef

resolvedDate 

resolvedDate: Date

属性值

Date

url 

url: string

属性值

string