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:

  1. Select the files in Solution Explorer, then right-click and select Copy/Merge > Resolve…​.
  2. 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.

  3. 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.

  4. Select a Resolve method:

  5. (Optional) Select Set as Auto Default to set your selections as the default for auto-resolving multiple files.
  6. Click Auto Resolve.
  7. 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):

  1. Select Interactively resolve files one at a time.
  2. Follow the procedure described in Resolving individual files.