GitConflict interface
Свойства
| conflict |
|
| conflict |
|
| conflict |
|
| merge |
|
| merge |
|
| merge |
|
| merge |
|
| resolution |
|
| resolution |
|
| resolved |
|
| resolved |
|
| url |
Сведения о свойстве
conflictId
conflictId: number
Значение свойства
number
conflictPath
conflictPath: string
Значение свойства
string
conflictType
mergeBaseCommit
mergeOrigin
mergeSourceCommit
mergeTargetCommit
resolutionError
resolutionStatus
resolvedBy
resolvedDate
resolvedDate: Date
Значение свойства
Date
url
url: string
Значение свойства
string