The Resolve command is used to
merge open files with other revisions or files.
This is equivalent to the command line:
This is the default option.
This is equivalent to the command line:
To include or exclude individual files from the operation,
click on the checkboxes for each file, and activate the
radio button for the Selected Files option.
Command:
Do not perform the resolve; merely display what would
happen to files in your client view if resolved.
Perform the resolve itself.
Options:
Interactively:
Automatically:
This is equivalent to the -as command-line option.
Only files that have non-conflicting changes (i.e., present
in yours-but-not-theirs or vice-versa)
will be merged automatically. Files with changes in both
yours-and-theirs will be skipped.
This is equivalent to the -am command-line option.
If there are conflicts, the file is skipped; if there are no
conflicts and yours hasn't changed it accepts
theirs; if theirs hasn't changed,
it accepts yours; if both yours
and theirs have changed (without conflicts),
it accepts the merge. Files that have no base for
merging (e.g. binary files) are always skipped.
This is equivalent to the -af command-line option.
The merged file will be forcibly accepted even if there are
conflicts.
This is equivalent to the -ay command-line option.
No merge will be performed; the changes that are yours
will overwrite theirs.
This is equivalent to the -at command-line option.
No merge will be performed; the changes that are theirs
will overwrite yours. (Note: This implies
that any changes made to the file in your client workspace will
be overwritten; use this option with care.)
Optional Flags:
This is equivalent to adding the -f (force) flag
command-line option. Normally, once a file has been resolved,
it won't show up as requiring further resolution; this option
can be used to re-edit a file if the results of the initial
resolve weren't satisfactory.
This is equivalent to adding the -v (verbose) flag
command-line option. Markers will be inserted into the file
for all changes, not just conflicting changes. The
markers must be edited out before the merged file can be
accepted.
Files:
All opened files:
Files in //client-path:
Files in the specified client path and all directories below
will be resolved.
p4 resolve //client-path/...
Only files in the specified client path will be resolved.
Any files in directories beneath the client path will be untouched.
p4 resolve //client-path/*
Selected Files:
[Return to "How to Use P4Web"]