PhpStorm 2016.1 Help

Integrating Changes to Branch

Subversion integration with PhpStorm enables you to integrate changes into a branch of your choice and commit the integration results to the repository.

To integrate changes from one branch to another

  1. In the Version Control tool window, switch to the Repository tab.
  2. Right-click the desired change list and select Subversion | Integrate To Branch in the context menu:
  3. To integrate specific files from a changelist, select the file(s) in the Changed Files pane and select Subversion | Integrate To Branch in the context menu.

    If you are using SVN 1.5 or higher both on the server and in your local working copy, select the relevant changelist/file(s) in the Changelists or Changed Files pane and click integrateToBranch on the toolbar.

    Integrating a changelist to a branch from the Merge Info pane
    Integrating files to a branch from the Merge Info pane
  4. The Integrate to Branch dialog box opens displaying the URL addresses of the source and target branches and a list of available local working copies. In the Integrate into Working Copy list, select the path to the local working copy into which the changelist will be integrated.
  5. To add a path to the list, click the add button.
  6. To remove a path from the list, click the delete button.
  7. To preview the merge result by enabling the --dry-run switch of the svn command, select the Try merge, but make no changes check box.

    If this check box is not selected, the sources are merged silently.

  8. To view all the files with local modifications after update, select the Run status after update check box.

    Technically, this means that the SVN status command will be applied after commit.

  9. Click OK. The Commit Changes dialog box opens.
  10. View the summary, specify the necessary option, and run commit.
  11. To view the integration results, open the Version Control tool window by choosing View | Tool Windows | Version Control.

    This information is available if you specified the Run status after update option in the Integrate to Branch dialog box.

See Also

Last modified: 12 July 2016