Perforce .NET API

Perforce .NET API

ActionVersion Class

AddFilesCmdFlags Enumeration

AddFilesCmdOptions Class

BaseFileType Enumeration

BranchCmdOptions Class

BranchesCmdOptions Class

BranchSpec Class

BranchSpecCmdFlags Enumeration

BranchSpecsCmdFlags Enumeration

ChangeCmdFlags Enumeration

ChangeCmdOptions Class

Changelist Class

ChangelistIdVersion Class

ChangeListStatus Enumeration

ChangesCmdFlags Enumeration

ChangesCmdOptions Class

Client.AutoResolveDelegate Delegate

Client.ResolveFileDelegate Delegate

ClientCmdFlags Enumeration

ClientCmdOptions Class

ClientMetadata Class

ClientNameVersion Class

ClientOption Enumeration

ClientPath Class

ClientsCmdFlags Enumeration

ClientsCmdOptions Class

ClientSubmitOptions Class

ClientType Enumeration

Connection Class

ConnectionStatus Enumeration

CopyFilesCmdFlags Enumeration

CopyFilesCmdOptions Class

CounterCmdFlags Enumeration

CounterCmdOptions Class

CoutnerCmdOptions Class

Credential Class

DateTimeVersion Class

DeleteFilesCmdFlags Enumeration

DeleteFilesCmdOptions Class

DepotCmdFlags Enumeration

DepotCmdOptions Class

DepotFileDiff Class

DepotPath Class

DepotType Enumeration

DescribeChangelistCmdFlags Enumeration

DescribeCmdOptions Class

DiffType Enumeration

DiffWhiteSpaceOptions Enumeration

EditCmdOptions Class

EditFilesCmdFlags Enumeration

EntryType Enumeration

ErrorGeneric Enumeration

ErrorSeverity Enumeration

ErrorSubsystem Enumeration

FileAction Enumeration

FileAnnotation Class

FileHistory Class

FileIntegrationRecord Class

FileLineMatch Class

FileLogCmdFlags Enumeration

FilelogCmdOptions Class

FileMetaData Class

FileResolveAction Class

FileResolveRecord Class

FilesCmdFlags Enumeration

FilesCmdOptions Class

FileSubmitRecord Class

FileTypeModifier Enumeration

FixAction Enumeration

FixJobsCmdFlags Enumeration

FixJobsCmdOptions Class

GetDepotDirsCmdFlags Enumeration

GetDepotDirsCmdOptions Class

GetDepotFileDiffsCmdFlags Enumeration

GetDepotFileDiffsCmdOptions Class

GetDepotFilesCmdFlags Enumeration

GetDepotFilesCmdOptions Class

GetFileAnnotationsCmdFlags Enumeration

GetFileAnnotationsCmdOptions Class

GetFileContentsCmdFlags Enumeration

GetFileContentsCmdOptions Class

GetFileDiffsCmdFlags Enumeration

GetFileDiffsCmdOptions Class

GetFileHistoryCmdFlags Enumeration

GetFileHistoryCmdOptions Class

GetFileLineMatchesCmdFlags Enumeration

GetFileLineMatchesCmdOptions Class

GetFileMetadataCmdFlags Enumeration

GetFileMetaDataCmdOptions Class

GetFixesCmdFlags Enumeration

GetFixesCmdOptions Class

GetMaxProtectionAccessCmdFlags Enumeration

GetMaxProtectionAccessCmdOptions Class

GetOpenedFilesCmdFlags Enumeration

GetOpenedFilesOptions Class

GetProtectionEntriesCmdFlags Enumeration

GetProtectionEntriesCmdOptions Class

GetProtectionTableCmdFlags Enumeration

GetProtectionTableCmdOptions Class

GetResolvedFilesCmdFlags Enumeration

GetReviewersCmdFlags Enumeration

GetReviewersCmdOptions Class

GetStreamMetaDataCmdFlags Enumeration

GetStreamMetaDataCmdOptions Class

GetSubmittedIntegrationsCmdFlags Enumeration

GetSubmittedIntegrationsCmdOptions Class

GetTriggerTableCmdFlags Enumeration

GetTriggerTableCmdOptions Class

GetTypeMapCmdFlags Enumeration

GetTypeMapCmdOptions Class

GroupCmdFlags Enumeration

GroupCmdOptions Class

GroupsCmdFlags Enumeration

GroupsCmdOptions Class

HaveRevision Class

HeadRevision Class

IKeepAlive Interface

InfoCmdFlags Enumeration

InfoCmdOptions Class

IntegrateFilesCmdFlags Enumeration

IntegrateFilesCmdOptions Class

JobCmdFlags Enumeration

JobCmdOptions Class

JobsCmdFlags Enumeration

JobsCmdOptions Class

LabelCmdFlags Enumeration

LabelCmdOptions Class

LabelNameVersion Class

LabelsCmdFlags Enumeration

LabelsCmdOptions Class

LabelSyncCmdFlags Enumeration

LabelSyncCmdOptions Class

LicenseCmdFlags Enumeration

LicenseCmdOptions Class

LineEnd Enumeration

LocalPath Class

LockCmdOptions Class

LogFile.LogMessageDelgate Delegate

LoginCmdFlags Enumeration

LoginCmdOptions Class

LogoutCmdFlags Enumeration

LogoutCmdOptions Class

MapType Enumeration

MatchType Enumeration

MergeFilesCmdFlags Enumeration

MergeFilesCmdOptions Class

MoveCmdOptions Class

MoveFileCmdFlags Enumeration

NoneRevision Class

OtherFileUser Class

OtherUsers Class

P4CallBacks Class

P4CallBacks.BinaryResultsDelegate Delegate

P4CallBacks.ErrorDelegate Delegate

P4CallBacks.InfoResultsDelegate Delegate

P4CallBacks.LogMessageDelegate Delegate

P4CallBacks.ParallelTransferDelegate Delegate

P4CallBacks.PromptDelegate Delegate

P4CallBacks.ResolveADelegate Delegate

P4CallBacks.ResolveDelegate Delegate

P4CallBacks.TaggedOutputDelegate Delegate

P4CallBacks.TextResultsDelegate Delegate

P4CantCloseConnectionException Class

P4ClientError Class

P4ClientErrorList Class

P4ClientInfoMessage Class

P4ClientInfoMessageList Class

P4ClientMerge Class

P4ClientMerge.MergeForce Enumeration

P4ClientMerge.MergeStatus Enumeration

P4ClientMerge.MergeType Enumeration

P4ClientResolve Class

P4Command Class

P4CommandCanceledException Class

P4CommandResult Class

P4CommandTimeOutException Class

P4Debugging Class

P4Exception Class

P4HungCommandCancelException Class

P4LostConnectionException Class

P4MapApi.Direction Enumeration

P4MapApi.Type Enumeration

P4Server.BinaryResultsDelegate Delegate

P4Server.CmdContactTimer Class

P4Server.CommandEchoDelegate Delegate

P4Server.ErrorDelegate Delegate

P4Server.InfoResultsDelegate Delegate

P4Server.ParallelTransferDelegate Delegate

P4Server.PromptHandlerDelegate Delegate

P4Server.ResolveAHandlerDelegate Delegate

P4Server.ResolveHandlerDelegate Delegate

P4Server.ResponseTimeEchoDelegate Delegate

P4Server.TaggedOutputDelegate Delegate

P4Server.TextResultsDelegate Delegate

P4ServerMT Class

P4TrustException Class

ParentView Enumeration

ProtectionEntry Class

ProtectionEntryExtensions Class

ProtectionMode Enumeration

ProtectionTable Class

ReconcileCmdOptions Class

ReconcileFilesCmdFlags Enumeration

ReopenCmdOptions Class

Repository Class

ResolveAction Enumeration

ResolveAnalysis Class

ResolveCmdOptions Class

ResolvedCmdOptions Class

ResolveFilesCmdFlags Enumeration

ResolveOptions Enumeration

ResolveSubtype Enumeration

ResolveType Enumeration

RevertCmdOptions Class

RevertFilesCmdFlags Enumeration

RevisionIntegrationSummary Class

ServerAddress Class

ServerIPMACaddress Class

ServerLicense Class

ServerMetaData Class

ServerMetaData.ServerTimeZone Class

ServerState Enumeration

ServerVersion Class

ShelvedFile Class

ShelvedInChangelistIdVersion Class

ShelveFilesCmdFlags Enumeration

ShelveFilesCmdOptions Class

SimpleList(T) Class

SimpleListItem(T) Class

SpecField Class

SpecFieldDataType Enumeration

SpecFieldFieldType Enumeration

StreamCmdFlags Enumeration

StreamCmdOptions Class

StreamIntegrationLog Class

StreamLog Class

StreamMetaData Class

StreamMetaData.IntegAction Enumeration

StreamOption Enumeration

StreamsCmdFlags Enumeration

StreamsCmdOptions Class

StreamType Enumeration

StringEnumCase Enumeration

StringList Class

SubmitCmdOptions Class

SubmitFilesCmdFlags Enumeration

SubmitResults Class

SubmitType Enumeration

SyncFilesCmdFlags Enumeration

SyncFilesCmdOptions Class

TagCmdOptions Class

TagFilesCmdFlags Enumeration

TaggedInfoItem Class

TaggedObject Class

TaggedObjectList Class

TriggerTable Class

TriggerType Enumeration

TrustCmdFlags Enumeration

TrustCmdOptions Class

TypeMapEntry Class

UnlockFilesCmdFlags Enumeration

UnlockFilesCmdOptions Class

UnshelveFilesCmdFlags Enumeration

UnshelveFilesCmdOptions Class

UserCmdFlags Enumeration

UserCmdOptions Class

UsersCmdFlags Enumeration

UsersCmdOptions Class

UserType Enumeration

VersionRange Class

VersionSpec Class

Click or drag to resize

P4ClientMergeMergeStatus Enumeration

Status of merge

Namespace: Perforce.P4
Assembly: p4api.net (in p4api.net.dll) Version: 2023.2.258.5793

Syntax

public enum MergeStatus

Public Enumeration MergeStatus

public enum class MergeStatus

type 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

See Also

Reference

Perforce.P4 Namespace

Send comments on this topic to [email protected]