GitConflictRenameAdd interface
Gegevensobject voor conflict met AddRename
- Uitbreiding
Eigenschappen
base |
|
resolution | |
source |
|
source |
|
target |
Overgenomen eigenschappen
conflict |
|
conflict |
|
conflict |
|
merge |
|
merge |
|
merge |
|
merge |
|
resolution |
|
resolution |
|
resolved |
|
resolved |
|
url |
Eigenschapdetails
baseBlob
resolution
sourceBlob
sourceOriginalPath
sourceOriginalPath: string
Waarde van eigenschap
string
targetBlob
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