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 상속된