Team Development and Resolving Conflicting Changes


File conflicts can occur when you submit a changelist containing a file that another user has edited and checked in. 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.

To resolve a file: in the Pending Changelist pane, right-click the file and choose the desired resolve option

Auto Resolve: to select a file in its entirety, without editing its contents, choose Auto Resolve and specify the file you want to submit.

The files you work with when auto-resolving are described as follows:

Manual Resolve: to compare the conflicting files and choose individual chunks or edit the file contents, choose Manual Resolve.

Auto-Resolve

The Auto-Resolve options are as follows.

Manual Resolve

The manual resolve editor enables you to create the result file by choosing individual chunks or editing the text. After you edit the file, save your changes by clicking Commit.


Copyright Perforce Software 2003. All Rights Reserved.