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:
- yours: the version of the file you checked out and changed in your
workspace
- theirs: the latest version of the file in the depot, containing changes
made by other users
- base: the common ancestor file
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.
- Accept Theirs: Accept their file as the head revision of the
file. Note that this option overwrites your file in the client workspace.
- Accept Yours: Accept your file as the most current version of
the file.
- Safe Automatic Resolve: If either your file, or their
file (but not both files) are different from the base file, accept the differing
version of the file as the head revision. If both files are different from
base file, do not perform a resolve on this file.
- Automatic Resolve: If their file is identical to the base file,
accept your file as the head revision. If your file is identical
to the base file, accept their file as the head revision. If your
file and their file are both different from the base file, but not
from each other, accept a merge of the two files. Otherwise, if there are
conflicts between your file and their file, do not perform resolve
on this file.
- Automatic Resolve, Including Conflict Markers: Accept the merged file
as the head revision regardless of the status of yours and their files. If
conflicts are found in the two file versions, the conflicts are marked and
retained. The file must then be edited manually to eliminate the conflicts.
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.