GitConflict interface
Propriedades
| conflict |
|
| conflict |
|
| conflict |
|
| merge |
|
| merge |
|
| merge |
|
| merge |
|
| resolution |
|
| resolution |
|
| resolved |
|
| resolved |
|
| url |
Detalhes de Propriedade
conflictId
conflictId: number
Valor de Propriedade
number
conflictPath
conflictPath: string
Valor de Propriedade
string
conflictType
mergeBaseCommit
mergeOrigin
mergeSourceCommit
mergeTargetCommit
resolutionError
resolutionStatus
resolvedBy
resolvedDate
resolvedDate: Date
Valor de Propriedade
Date
url
url: string
Valor de Propriedade
string