다음을 통해 공유

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