GitResolutionError enum
The type of a merge conflict.
Fields
None = 0 | No error |
MergeContentNotFound = 1 | User set a blob id for resolving a content merge, but blob was not found in repo during application |
PathInUse = 2 | Attempted to resolve a conflict by moving a file to another path, but path was already in use |
InvalidPath = 3 | No error |
UnknownAction = 4 | GitResolutionAction was set to an unrecognized value |
UnknownMergeType = 5 | GitResolutionMergeType was set to an unrecognized value |
OtherError = 255 | Any error for which a more specific code doesn't apply |
反馈
https://aka.ms/ContentUserFeedback。
即将发布:在整个 2024 年,我们将逐步淘汰作为内容反馈机制的“GitHub 问题”,并将其取代为新的反馈系统。 有关详细信息,请参阅:提交和查看相关反馈