PyCharm 2016.1 Help

Handling Modified Without Checkout FilesResolving Conflicts with Perforce Integration

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.

integrateInfoTab

To integrate a Perforce branch into a project

  1. On the main menu, choose VCS | Integrate Project.
  2. In the Integrate dialog box, select the Perforce tab (if both Perforce and Subversion integrations are used in this project).
  3. Select the sources to be merged, and the desired revision.
  4. Define VCS-specific merge options.
  5. Click OK.
Handling Modified Without Checkout FilesResolving Conflicts with Perforce Integration

See Also

Procedures:

Reference:

Last modified: 20 April 2016