Resolving files

Conflicts occur when you attempt to integrate a file into an existing codeline or to submit a changelist containing a file that another user has edited and submitted while you had the file checked out. When the conflict occurs, Perforce schedules the file for resolve. Conflicts must be resolved before the changelist that contains the conflicting file can be successfully submitted.

When you attempt to submit a changelist containing a file that must be resolved, the Submit Changelist form displays instructions and the Submit button is grayed out.

If the dialog says Out of date and there is a yellow triangle badge on any file, get the latest revision of that file by context-clicking it and selecting Get Latest Revision. This will not overwrite the copy of the file that is in your workspace.

Once you have the latest revision, you now need to resolve the file(s). As described below, you can either resolve files individually, or attempt to resolve multiple files at once.

Resolving individual files

To resolve an individual file: context-click that file and select Resolve....

The Resolve dialog displays the following information:

Files to Resolve

This is the file that needs to be resolved and the version of the file that it needs to be resolved with.

Recommended action
P4V recommends an action, based on the differences and conflicts in the file selected. This recommendation is followed by an explanation.

Resolve options

Additional options

To submit the file, you must resolve it by accepting one of the version (your or theirs) or by running the Merge tool to edit and save the file. After you resolve the file, submit your changelist in which it is open.

Resolving multiple files

To resolve multiple files at one time, select the files, then context-click and select Resolve.... The Resolve dialog displays the following information:

Files to Resolve

These are the files that needs to be resolved. As files are resolved, they are removed from this list.

Recommended action

P4V recommends an action, based on the differences and conflicts in the files selected. P4V recommends one of two actions:

Resolve options
Choose Auto or Interactive resolve.

If you select Auto resolve and there are conflicts in any of the files, P4V prompts you to resolve each file individually.