GitConflictFileDirectory interface
Oggetto dati per il conflitto DirectoryFile
- Extends
Proprietà
| resolution | |
| source |
|
| target |
Proprietà ereditate
| conflict |
|
| conflict |
|
| conflict |
|
| merge |
|
| merge |
|
| merge |
|
| merge |
|
| resolution |
|
| resolution |
|
| resolved |
|
| resolved |
|
| url |
Dettagli proprietà
resolution
sourceBlob
targetTree
Dettagli proprietà ereditate
conflictId
conflictPath
conflictType
mergeBaseCommit
mergeOrigin
mergeSourceCommit
mergeTargetCommit
resolutionError
resolutionStatus
resolutionStatus: GitResolutionStatus
Valore della proprietà
Ereditato daGitConflict.resolutionStatus