The type of a merge conflict.

Enumeration Members

InvalidPath: 3

No error

MergeContentNotFound: 1

User set a blob id for resolving a content merge, but blob was not found in repo during application

None: 0

No error

OtherError: 255

Any error for which a more specific code doesn't apply

PathInUse: 2

Attempted to resolve a conflict by moving a file to another path, but path was already in use

UnknownAction: 4

GitResolutionAction was set to an unrecognized value

UnknownMergeType: 5

GitResolutionMergeType was set to an unrecognized value