GitConflictEditDelete interface

Paket:

azure-devops-extension-api

Objek data untuk konflik DeleteEdit

Memperluas

GitConflict

Properti

baseBlob
resolution
sourceBlob

Properti yang Diwariskan

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

Detail Properti

baseBlob

baseBlob: GitBlobRef

Nilai Properti

GitBlobRef

resolution

resolution: GitResolutionPickOneAction

Nilai Properti

GitResolutionPickOneAction

sourceBlob

sourceBlob: GitBlobRef

Nilai Properti

GitBlobRef

Detail Properti yang Diwariskan

conflictId

conflictId: number

Nilai Properti

number

Diwarisi dariGitConflict.conflictId

conflictPath

conflictPath: string

Nilai Properti

string

Diwarisi dariGitConflict.conflictPath

conflictType

conflictType: GitConflictType

Nilai Properti

GitConflictType

Diwarisi dariGitConflict.conflictType

mergeBaseCommit

mergeBaseCommit: GitCommitRef

Nilai Properti

GitCommitRef

Diwarisi dariGitConflict.mergeBaseCommit

mergeOrigin

mergeOrigin: GitMergeOriginRef

Nilai Properti

GitMergeOriginRef

Diwarisi dariGitConflict.mergeOrigin

mergeSourceCommit

mergeSourceCommit: GitCommitRef

Nilai Properti

GitCommitRef

Diwarisi dariGitConflict.mergeSourceCommit

mergeTargetCommit

mergeTargetCommit: GitCommitRef

Nilai Properti

GitCommitRef

Diwarisi dariGitConflict.mergeTargetCommit

resolutionError

resolutionError: GitResolutionError

Nilai Properti

GitResolutionError

Diwarisi dariGitConflict.resolutionError

resolutionStatus

resolutionStatus: GitResolutionStatus

Nilai Properti

GitResolutionStatus

Diwarisi dariGitConflict.resolutionStatus

resolvedBy

resolvedBy: IdentityRef

Nilai Properti

IdentityRef

Diwarisi dariGitConflict.resolvedBy

resolvedDate

resolvedDate: Date

Nilai Properti

Date

Diwarisi dariGitConflict.resolvedDate

url

url: string

Nilai Properti

string

Diwarisi dariGitConflict.url