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