GitConflictDirectoryFile interface
FileDirectory 冲突的数据对象
- Extends
属性
resolution | |
source |
|
target |
继承属性
conflict |
|
conflict |
|
conflict |
|
merge |
|
merge |
|
merge |
|
merge |
|
resolution |
|
resolution |
|
resolved |
|
resolved |
|
url |
属性详细信息
resolution
sourceTree
targetBlob
继承属性详细信息
conflictId
conflictPath
conflictType
mergeBaseCommit
mergeOrigin
mergeSourceCommit
mergeTargetCommit
resolutionError
resolutionStatus
resolvedBy
resolvedDate
url
反馈
https://aka.ms/ContentUserFeedback。
即将发布:在整个 2024 年,我们将逐步淘汰作为内容反馈机制的“GitHub 问题”,并将其取代为新的反馈系统。 有关详细信息,请参阅:提交和查看相关反馈