Integrating Perforce Files
You can merge changes between the branches into your local working copy, using the branch specification, or a changelist.
The Integrate Project command is available for both Perforce and Subversion integrations.
Integration results display in the Integrate Info tab of the Version Control tool window. Context menu of a file enables you to compare versions, view history and annotations, browse changes and more.
To integrate a Perforce branch into a project
- On the main menu, choose VCS | Integrate Project .
- In the Integrate dialog box, select the Perforce tab (if both Perforce and Subversion integrations are used in this project).
- Select the sources to be merged, and the desired revision.
- Define VCS-specific merge options.
- Click OK.