Status of merge
Namespace: Perforce.P4Assembly: p4api.net (in p4api.net.dll) Version: 2017.3.160.836 (2017.3.160.0836)
Syntax
C# |
---|
public enum MergeStatus |
Visual Basic |
---|
Public Enumeration MergeStatus |
Visual C++ |
---|
public enum class MergeStatus |
Members
Member name | Value | Description | |
---|---|---|---|
CMS_NONE | -1 | Not determined | |
CMS_QUIT | 0 | User wants to quit | |
CMS_SKIP | 1 | Skip the integration record | |
CMS_MERGED | 2 | Accepted merged theirs and yours | |
CMS_EDIT | 3 | Accepted edited merge | |
CMS_THEIRS | 4 | Accepted theirs | |
CMS_YOURS | 5 | Accepted yours |