共用方式為

GitConflictDirectoryFile interface

  • 參考
套件:
azure-devops-extension-api

FileDirectory 衝突的數據物件

Extends
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