GitConflictAddRename interface
Gegevensobject voor conflict met RenameAdd
- Uitbreiding
Eigenschappen
| base |
|
| resolution | |
| source |
|
| target |
|
| target |
Overgenomen eigenschappen
| conflict |
|
| conflict |
|
| conflict |
|
| merge |
|
| merge |
|
| merge |
|
| merge |
|
| resolution |
|
| resolution |
|
| resolved |
|
| resolved |
|
| url |
Eigenschapdetails
baseBlob
resolution
sourceBlob
targetBlob
targetOriginalPath
targetOriginalPath: string
Waarde van eigenschap
string
Details van overgenomen eigenschap
conflictId
conflictPath
conflictType
mergeBaseCommit
mergeOrigin
mergeSourceCommit
mergeTargetCommit
resolutionError
resolutionError: GitResolutionError
Waarde van eigenschap
overgenomen vanGitConflict.resolutionError-
resolutionStatus
resolutionStatus: GitResolutionStatus
Waarde van eigenschap
overgenomen vanGitConflict.resolutionStatus