Open topic with navigation
Resolving multiple files
When there are multiple files in a changelist that need to be resolved,
it is recommended that you first try to resolve them automatically.
To resolve multiple files at once, automatically:
- Select the files in Solution Explorer, then right-click and select
Copy/Merge > Resolve….
-
In the Resolve dialog, select Auto resolve multiple
files.
The dialog displays the Files to Resolve. As files are
resolved, they are removed from this list.
-
Select whether to Merge binary files as text when resolving
content.
If you select this option,
P4VS
treats binary files like text files and attempts a textual merge
between the source and target files.
-
Select a Resolve method:
- Safe automatic resolve (no merging): Accepts the source
file (the file in the depot) if it has the only changes. Accepts
the target file (the file in your workspace) if it has the only
changes. Doesn’t resolve if both the source and target have
changed.
- Automatic resolve (allow merging): Accepts the source if
it has the only changes. Accepts the target file if it has the only
changes. Merges changes if both the source and target have changed
and there are no conflicts.
- Accept Source: Replaces the copy of the file in your
workspace with the version that is in the depot, discarding your
changes.
- Accept Target: Accepts the file that is in your workspace,
overwriting the version that is in the depot when you submit the
file.
- Automatic resolve (allow merging with conflicts): Accepts
the source if it has the only changes. Accepts the target file if
it has the only changes. Creates a merged file if both the source
and target have changed, even if there are conflicts. Where there
are conflicts, both versions are included with text notations
indicating the conflicts.
- (Optional) Select Set as Auto Default to set your selections
as the default for auto-resolving multiple files.
- Click Auto Resolve.
- To check in the changes, submit the changelist that includes the
resolved files.
To resolve multiple files one at a time (recommended when there are
conflicts):
- Select Interactively resolve files one at a time.
- Follow the procedure described in
Resolving individual files.