P4Web Release 2005.1 User Guide
[Getting Started]  [How To...]  [Browser Tips]  [Glossary]  [Road Map]  

Resolving Files

The resolve command is used tell Perforce how to combine changes between files, and to merge file content, if desired. You can run resolve on open files only, and only if they need resolving. P4Web uses the "" icon to show you which of your open files need to be resolved.

There are two situations that require files to be resolved:

  1. You have files open for edit and there are newer versions of the files in the depot. As soon as you re-sync the files, or attempt to submit them, they will need to be resolved to account for the changes made in the new file versions.

  2. You have files open for integrate. These files will need resolving as soon as they are opened to account for the changes made in the files you are integrating from.

You can run resolve by:

The Resolve options page

Selecting Resolve... from the pulldown menu takes you to the Resolve options page where you can select resolve options, preview the resolve command you are about to run, and run the command. (Previewing the command shows you which files will be affected, but doesn't tell you what the outcome will be.)

For the purpose of files handled by the resolve command:

The Resolve options page lets you choose how the resolve will be done. Your choices are:

Restricting files

If you came to the "Resolve" options page by selecting a directory first, you can restrict the files to be resolved. Regardless of which files you select, files will only resolved if they are already opened in your workspace and need resolving.


Copyright 2005 Perforce Software. All rights reserved.