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.

The files you work with when resolving are described in Perforce and Perforce merge utilities as follows:

When you attempt to submit a changelist containing a file that must be resolved, the Submit form displays a Resolve button instead of a Submit button. Click Resolve and choose the desired resolve option. The merge utility is launched and you can see all conflicts in detail and determine how to resolve them.

After you resolve files, the Submit dialog displays a Submit button and you can submit the changelist containing the resolved files.