Perforce Software

P4Web "resolve" Help Page

[Return to "How to Use P4Web"]

The Resolve command is used to merge open files with other revisions or files.

Command:

Two versions of the Resolve command are available:

Options:

Two options are provided:

Interactively:

(The interactive resolve function is not yet available.)

Automatically:

The automatic resolve function can be done in four ways, selectable from a drop-down menu:
  • Accept safe (unilateral) changes:
    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.
  • Accept only non-conflicting merges:
    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.
  • Accept all merges:
    This is equivalent to the -af command-line option. The merged file will be forcibly accepted even if there are conflicts.
  • Accept yours (ignore theirs):
    This is equivalent to the -ay command-line option. No merge will be performed; the changes that are yours will overwrite theirs.
  • Accept theirs (ignore yours):
    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:

Either resolution method as selected above may be combined with one, or both, of the following optional flags:
  • Force re-resolve of previously resolved files:
    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.
  • Mark non-conflicting changes in merged result:
    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:

Specifies which files will be resolved. Choose between:

All opened files:

All opened files in the current client view will be included.

Files in //client-path:

  • ...and subdirectories:
    Files in the specified client path and all directories below will be resolved.

    This is equivalent to the command line:
    p4 resolve //client-path/...

    This is the default option.

  • ...at this level only:
    Only files in the specified client path will be resolved. Any files in directories beneath the client path will be untouched.

    This is equivalent to the command line:
    p4 resolve //client-path/*

Selected Files:

If files at the current directory level are scheduled for resolve, a list of such files will appear.

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.

[Return to "How to Use P4Web"]


Copyright 2000 Perforce Software
$Id: //depot/r99.2/p4-doc/manuals/p4web/help/resolve.html#2 $