PyCharm 2016.1 Help

Integrating DifferencesResolving Conflicts

Integrating Project

You might need to integrate your local version of a project into a certain revision of that project in the repository. For this purpose PyCharm provides Integrate Project command.

Integrating project is only available for the projects that contain directories associated with Perforce or Subversion. If neither of these two VCS is involved in project, the Integrate Project command is disabled in the menu.

To integrate different sources into one project

  1. On the main menu, choose VCS | Integrate Project. The Integrate dialog appears.
  2. Select Perforce or Subversion tab, and configure merge options as required. Refer to the respective procedural topics for details.
Integrating DifferencesResolving Conflicts

See Also

Procedures:

Reference:

Last modified: 20 April 2016