Perforce .NET API

Perforce.P4

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 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

Counter Class

CounterCmdFlags Enumeration

CounterCmdOptions Class

CoutnerCmdOptions Class

Credential Class

DateTimeVersion Class

DeleteFilesCmdFlags Enumeration

DeleteFilesCmdOptions Class

Depot 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

File Class

FileAction Enumeration

FileAnnotation Class

FileDiff Class

FileHistory Class

FileIntegrationRecord Class

FileLineMatch Class

FileLogCmdFlags Enumeration

FilelogCmdOptions Class

FileMetaData Class

FileResolveAction Class

FileResolveRecord Class

FilesCmdFlags Enumeration

FilesCmdOptions Class

FileSpec Class

FileSubmitRecord Class

FileType Class

FileTypeModifier Enumeration

Fix Class

FixAction Enumeration

FixJobsCmdFlags Enumeration

FixJobsCmdOptions Class

FormBase Class

FormSpec 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

Group Class

GroupCmdFlags Enumeration

GroupCmdOptions Class

GroupsCmdFlags Enumeration

GroupsCmdOptions Class

HaveRevision Class

HeadRevision Class

IKeepAlive Interface

InfoCmdFlags Enumeration

InfoCmdOptions Class

IntegrateFilesCmdFlags Enumeration

IntegrateFilesCmdOptions Class

Job Class

JobCmdFlags Enumeration

JobCmdOptions Class

JobsCmdFlags Enumeration

JobsCmdOptions Class

Label Class

LabelCmdFlags Enumeration

LabelCmdOptions Class

LabelNameVersion Class

LabelsCmdFlags Enumeration

LabelsCmdOptions Class

LabelSyncCmdFlags Enumeration

LabelSyncCmdOptions Class

LicenseCmdFlags Enumeration

LicenseCmdOptions Class

LogFile.LogMessageDelgate Delegate

LoginCmdFlags Enumeration

LoginCmdOptions Class

LogoutCmdFlags Enumeration

LogoutCmdOptions Class

MapEntry Class

MapType Enumeration

MatchType Enumeration

MergeFilesCmdFlags Enumeration

MergeFilesCmdOptions Class

MoveCmdOptions Class

MoveFileCmdFlags Enumeration

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 Class

P4MapApi.Direction Enumeration

P4MapApi.Type Enumeration

P4Server Class

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

PathSpec Class

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

Revision Class

RevisionIntegrationSummary Class

Server 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

Stream Class

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

Trigger Class

TriggerTable Class

TriggerType Enumeration

TrustCmdFlags Enumeration

TrustCmdOptions Class

TypeMap Class

TypeMapEntry Class

UnlockFilesCmdFlags Enumeration

UnlockFilesCmdOptions Class

UnshelveFilesCmdFlags Enumeration

UnshelveFilesCmdOptions Class

User Class

UserCmdFlags Enumeration

UserCmdOptions Class

UsersCmdFlags Enumeration

UsersCmdOptions Class

ResolveFilesCmdFlags Enumeration

Flags for the resolve command.

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

Syntax

C++

Copy

[FlagsAttribute]
public enum ResolveFilesCmdFlags

<FlagsAttribute>
Public Enumeration ResolveFilesCmdFlags

[FlagsAttribute]
public enum class ResolveFilesCmdFlags

[<FlagsAttribute>]
type ResolveFilesCmdFlags

Members

Member name	Value	Description
None	0	No flags.
FileAttributesOnly	1	The -A flag can be used to limit the kind of resolving that will be attempted; without it, everything is attempted: -Aa Resolve attributes set by "p4 attribute"
FileBranchingOnly	2	The -A flag can be used to limit the kind of resolving that will be attempted; without it, everything is attempted: -Ab Resolve Integrations where the source is edited and the target deleted
FileContentChangesOnly	4	The -A flag can be used to limit the kind of resolving that will be attempted; without it, everything is attempted: -Ac Resolve file content changes as well as actions
FileDeletionsOnly	8	The -A flag can be used to limit the kind of resolving that will be attempted; without it, everything is attempted: -Ad Resolve integrations where the source is deleted and target is edited.
FileMovesOnly	16	The -A flag can be used to limit the kind of resolving that will be attempted; without it, everything is attempted: -Am Resolve moved and renamed files.
FileTypeChangesOnly	32	The -A flag can be used to limit the kind of resolving that will be attempted; without it, everything is attempted: -At Resolve filetype changes.
FileTypeCharsetChangesOnly	64	The -A flag can be used to limit the kind of resolving that will be attempted; without it, everything is attempted: -AQ Resolve charset changes.
LimitFlags	127	Resolve using All -A flags
AutomaticSafeMode	256	-as: Safe Accept. If either yours or theirs is different from base, (and the changes are in common) accept that revision. If both are different from base, skip this file. The -a flag puts 'p4 resolve' into automatic mode. The user is not prompted, and files that can't be resolved automatically are skipped:
AutomaticMergeMode	512	-am: Automatic Mode. Automatically accept the Perforce-recommended file revision: if theirs is identical to base, accept yours; if yours is identical to base, accept theirs; if yours and theirs are different from base, and there are no conflicts between yours and theirs; accept merge; otherwise, there are conflicts between yours and theirs, so skip this file. The -a flag puts 'p4 resolve' into automatic mode. The user is not prompted, and files that can't be resolved automatically are skipped:
AutomaticForceMergeMode	1024	-af: Force Accept. Accept the merge file no matter what. If the merge file has conflict markers, they will be left in, and you’ll need to remove them by editing the file. The -a flag puts 'p4 resolve' into automatic mode. The user is not prompted, and files that can't be resolved automatically are skipped:
AutomaticTheirsMode	2048	-at: Accept Theirs. Use this option with caution, as the file in the client workspace will be overwritten! The -a flag puts 'p4 resolve' into automatic mode. The user is not prompted, and files that can't be resolved automatically are skipped:
AutomaticYoursMode	8192	-ay: Accept Yours, ignore theirs. It preserves the content of workspace files. The -a flag puts 'p4 resolve' into automatic mode. The user is not prompted, and files that can't be resolved automatically are skipped:
ActionFlags	12032	All Action Resolve Actions
ForceResolve	16384	The -f flag enables previously resolved files to be resolved again. By default, after files have been resolved, 'p4 resolve' does not process them again.
PreviewOnly	32768	The -n flag previews the operation without altering files.
PreviewPlusOnly	65536	The -N flag previews the operation with additional information about any non-content resolve actions that are scheduled.
DisplayBaseFile	131072	The -o flag displays the base file name and revision to be used during the the merge.
ForceTextualMerge	262144	The -t flag forces 'p4 resolve' to attempt a textual merge, even for files with non-text (binary) types.
MarkAllChanges	524288	The -v flag causes 'p4 resolve' to insert markers for all changes, not just conflicts.
IgnoreWhitespaceChanges	1048576	The -d flags can be used to control handling of whitespace and line endings when merging files: -db Ignore Whitespace Changes
IgnoreWhitespace	2097152	The -d flags can be used to control handling of whitespace and line endings when merging files: -dw Ignore whitespace altogether.
IgnoreLineEndings	4194304	The -d flags can be used to control handling of whitespace and line endings when merging files: -dl Ignore Line Endings
WsFlags	7340032	All Whitespace and line ending flags together
ResolveStream	144	The -So flag cen be used to resolve opened Stream spec

Reference

Perforce.P4 Namespace