Flags for the resolve command.
Namespace: Perforce.P4Assembly: p4api.net (in p4api.net.dll) Version: 2015.1.103.4687 (2015.1.103.4687)
Syntax
| C# |
|---|
[FlagsAttribute] public enum ResolveFilesCmdFlags |
| Visual Basic |
|---|
<FlagsAttribute> _ Public Enumeration ResolveFilesCmdFlags |
| Visual C++ |
|---|
[FlagsAttribute] public enum class 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. | |
| 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 file branching. | |
| 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. | |
| 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 file deletions. | |
| 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. | |
| AFlags | 63 | ||
| AutomaticSafeMode | 256 | The -a flag puts 'p4 resolve' into automatic mode. The user is not prompted, and files that can't be resolved automatically are skipped: -as 'Safe' resolve; skip files that need merging. The -as flag causes the workspace file to be replaced with their file only if theirs has changed and yours has not. | |
| AutomaticMergeMode | 512 | The -a flag puts 'p4 resolve' into automatic mode. The user is not prompted, and files that can't be resolved automatically are skipped: -am Resolve by merging; skip files with conflicts. The -am flag causes the workspace file to be replaced with the result of merging theirs with yours. If the merge detected conflicts, the file is left untouched and unresolved. | |
| AutomaticForceMergeMode | 1024 | The -a flag puts 'p4 resolve' into automatic mode. The user is not prompted, and files that can't be resolved automatically are skipped: -af Force acceptance of merged files with conflicts. The -af flag causes the workspace file to be replaced with the result of merging theirs with yours, even if there were conflicts. This can leave conflict markers in workspace files. | |
| AutomaticTheirsMode | 2048 | The -a flag puts 'p4 resolve' into automatic mode. The user is not prompted, and files that can't be resolved automatically are skipped: -at Force acceptance of theirs; overwrites yours. The -at flag resolves all files by copying theirs into yours. It should be used with care, as it overwrites any changes made to the file in the client workspace. | |
| AutomaticYoursMode | 8192 | The -a flag puts 'p4 resolve' into automatic mode. The user is not prompted, and files that can't be resolved automatically are skipped: -ay Force acceptance of yours; ignores theirs. The -ay flag resolves all files by accepting yours and ignoring theirs. It preserves the content of workspace files. | |
| aFlags | 12032 | ||
| 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 Ingore 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 |
