GitConflictDirectoryFile interface
Data object for FileDirectory conflict
- Extends
Properties
resolution | |
source |
|
target |
Inherited Properties
conflict |
|
conflict |
|
conflict |
|
merge |
|
merge |
|
merge |
|
merge |
|
resolution |
|
resolution |
|
resolved |
|
resolved |
|
url |
Property Details
resolution
sourceTree
targetBlob
Inherited Property Details
conflictId
conflictPath
conflictType
mergeBaseCommit
mergeOrigin
mergeSourceCommit
mergeTargetCommit
resolutionError
resolutionStatus
resolvedBy
resolvedDate
url
Feedback
https://aka.ms/ContentUserFeedback.
Coming soon: Throughout 2024 we will be phasing out GitHub Issues as the feedback mechanism for content and replacing it with a new feedback system. For more information see:Submit and view feedback for