編輯

共用方式為


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