GitConflictRenameAdd interface
Datový objekt pro konflikt AddRename
- Extends
Vlastnosti
base |
|
resolution | |
source |
|
source |
|
target |
Zděděné vlastnosti
conflict |
|
conflict |
|
conflict |
|
merge |
|
merge |
|
merge |
|
merge |
|
resolution |
|
resolution |
|
resolved |
|
resolved |
|
url |
Podrobnosti vlastnosti
baseBlob
resolution
sourceBlob
sourceOriginalPath
sourceOriginalPath: string
Hodnota vlastnosti
string
targetBlob
Podrobnosti zděděných vlastností
conflictId
conflictPath
conflictType
mergeBaseCommit
mergeOrigin
mergeOrigin: GitMergeOriginRef
Hodnota vlastnosti
mergeSourceCommit
mergeTargetCommit
resolutionError
resolutionStatus
resolutionStatus: GitResolutionStatus