Editar

Compartir a través de


GitConflict interface

Properties

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

Property Details

conflictId

conflictId: number

Property Value

number

conflictPath

conflictPath: string

Property Value

string

conflictType

conflictType: GitConflictType

Property Value

mergeBaseCommit

mergeBaseCommit: GitCommitRef

Property Value

mergeOrigin

mergeOrigin: GitMergeOriginRef

Property Value

mergeSourceCommit

mergeSourceCommit: GitCommitRef

Property Value

mergeTargetCommit

mergeTargetCommit: GitCommitRef

Property Value

resolutionError

resolutionError: GitResolutionError

Property Value

resolutionStatus

resolutionStatus: GitResolutionStatus

Property Value

resolvedBy

resolvedBy: IdentityRef

Property Value

resolvedDate

resolvedDate: Date

Property Value

Date

url

url: string

Property Value

string