Bagikan melalui


GitConflict interface

Properti

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

Detail Properti

conflictId

conflictId: number

Nilai Properti

number

conflictPath

conflictPath: string

Nilai Properti

string

conflictType

conflictType: GitConflictType

Nilai Properti

mergeBaseCommit

mergeBaseCommit: GitCommitRef

Nilai Properti

mergeOrigin

mergeOrigin: GitMergeOriginRef

Nilai Properti

mergeSourceCommit

mergeSourceCommit: GitCommitRef

Nilai Properti

mergeTargetCommit

mergeTargetCommit: GitCommitRef

Nilai Properti

resolutionError

resolutionError: GitResolutionError

Nilai Properti

resolutionStatus

resolutionStatus: GitResolutionStatus

Nilai Properti

resolvedBy

resolvedBy: IdentityRef

Nilai Properti

resolvedDate

resolvedDate: Date

Nilai Properti

Date

url

url: string

Nilai Properti

string