Helix Core is now P4. Product user interfaces will be updated soon. Learn more >>

P4 for Visual Studio Documentation | 2025.1

# Resolve individual files

To resolve an individual file:

1. Select the file in Solution Explorer, then right-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, P4 for Visual Studio treats binary files like text files and attempts a textual merge between the source and target files.

4. View the Recommended action.

   P4 for Visual Studio recommends an action, based on the differences and conflicts in the files selected. It also displays:

   - The common base file
   - The number of differences between the source and base file
   - The number of differences between the target and base file
   - The number of conflicts that would be present in the merged result.

5. Select a Resolve method:

   - 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.
   - Accept Merged: Replaces the file in your workspace with the merged result of the target file (in your workspace) and source file (in the depot).
   - Run merge tool: Opens your chosen merge tool, enabling you to edit the file and save the merged result.

6. Select any Additional Actions that apply:

   - Open File: Enables you to open either version of the file individually or the merged result file in any editor.
   - Diff: Opens your diff tool to diff the files with each other or with the base file. It also enables you to diff the source, target, and base file with the merged file.
   - File History: Displays the revision history of either file.
   - Time-lapse View: Displays the history of either file using the Time-lapse View tool.
   - Revision Graph: Displays the history of either file using the Revision Graph tool.

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

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

Your search for returned results