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:

In order to submit the file, you will need to resolve it using one of the above options, either by clicking one of the Accept buttons to accept any one version of the file or by running the Merge tool to edit and save the file. Once you have resolved the file, you can submit your changelist.

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:

If you select Auto resolve but there are still conflicts remaining in any of the files, P4V prompts you to interactively resolve each file individually. If all files can be automatically resolved, you can then submit your changelist.