GitConflictAddAdd interface

Paket:

azure-devops-extension-api

Objek data untuk konflik TambahkanTambahkan

Memperluas

GitConflict

Properti

resolution
sourceBlob
targetBlob

Properti yang Diwariskan

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

Detail Properti

resolution

resolution: GitResolutionMergeContent

Nilai Properti

GitResolutionMergeContent

sourceBlob

sourceBlob: GitBlobRef

Nilai Properti

GitBlobRef

targetBlob

targetBlob: GitBlobRef

Nilai Properti

GitBlobRef

Detail Properti yang Diwariskan

conflictId

conflictId: number

Nilai Properti

number

Diwariskan DariGitConflict.conflictId

conflictPath

conflictPath: string

Nilai Properti

string

Diwariskan DariGitConflict.conflictPath

conflictType

conflictType: GitConflictType

Nilai Properti

GitConflictType

Diwarisi DariGitConflict.conflictType

mergeBaseCommit

mergeBaseCommit: GitCommitRef

Nilai Properti

GitCommitRef

Diwariskan DariGitConflict.mergeBaseCommit

mergeOrigin

mergeOrigin: GitMergeOriginRef

Nilai Properti

GitMergeOriginRef

Diwariskan 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

Diwariskan DariGitConflict.resolutionStatus

resolvedBy

resolvedBy: IdentityRef

Nilai Properti

IdentityRef

Diwariskan DariGitConflict.resolvedBy

resolvedDate

resolvedDate: Date

Nilai Properti

Date

Diwariskan DariGitConflict.resolvedDate

url

url: string

Nilai Properti

string

Diwariskan DariGitConflict.url