Resolving individual files

To resolve an individual file:

  1. Select the file in Solution Explorer, then context-click and select Copy/Merge > Resolve…​.
  2. Select Interactively resolve files one at a time.

    The Resolve dialog displays the Files to Resolve. If you are resolving multiple files one at a time, select the file you want to resolve. The files are removed from this list as they are resolved.

  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. View the Recommended action.

    P4VS recommends an action, based on the differences and conflicts in the files selected. It also displays:

  5. Select a Resolve method:

  6. Select any Additional Actions that apply:

  7. When the resolve is complete, check in the changes by submitting the changelist that includes the resolved file.

    Note

    The default diff and merge tool for P4VS is P4Merge. You can set diff and merge preferences, including configuring the diff and merge tool of your choice, on the Perforce - Diff/Merge node under Tools > Options > Source Control.