GitConflictDirectoryFile interface

包:

azure-devops-extension-api

FileDirectory 冲突的数据对象

扩展

GitConflict

属性

resolution
sourceTree
targetBlob

继承属性

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

属性详细信息

resolution

resolution: GitResolutionPathConflict

属性值

GitResolutionPathConflict

sourceTree

sourceTree: GitTreeRef

属性值

GitTreeRef

targetBlob

targetBlob: GitBlobRef

属性值

GitBlobRef

继承属性详细信息

conflictId

conflictId: number

属性值

number

继承自GitConflict.conflictId 的

conflictPath

conflictPath: string

属性值

string

继承自GitConflict.conflictPath

conflictType

conflictType: GitConflictType

属性值

GitConflictType

继承自GitConflict.conflictType

mergeBaseCommit

mergeBaseCommit: GitCommitRef

属性值

GitCommitRef

继承自GitConflict.mergeBaseCommit

mergeOrigin

mergeOrigin: GitMergeOriginRef

属性值

GitMergeOriginRef

继承自GitConflict.mergeOrigin

mergeSourceCommit

mergeSourceCommit: GitCommitRef

属性值

GitCommitRef

继承自GitConflict.mergeSourceCommit

mergeTargetCommit

mergeTargetCommit: GitCommitRef

属性值

GitCommitRef

继承自GitConflict.mergeTargetCommit

resolutionError

resolutionError: GitResolutionError

属性值

GitResolutionError

继承自GitConflict.resolutionError

resolutionStatus

resolutionStatus: GitResolutionStatus

属性值

GitResolutionStatus

继承自GitConflict.resolutionStatus

resolvedBy

resolvedBy: IdentityRef

属性值

IdentityRef

继承自GitConflict.resolvedBy

resolvedDate

resolvedDate: Date

属性值

Date

继承自GitConflict.resolvedDate

url

url: string

属性值

string

继承自GitConflict.url