PhpStorm 2017.2 Help

Viewing and Managing Integration Status

With the extended Merge Info functionality, you can view and update changelists' integration status.

Subversion stores the information on whether a changelist has been integrated into the local working copy or not. Based on this data, PhpStorm informs you on the integration status of a specific changelist by displaying one of the following icons next to it:

  • merged integrated
  • notMerged not integrated
  • integrationStatusUnknown integration status unknown
  • commonHistory common history

To have the integration status displayed, click the Highlight Integrated button highlightIntegrated on the Merge Info pane toolbar.

You can change the integration status of a changelist without actually integrating it into the working copy or reverting the previous integration. This will affect only the administrative data.

To toggle the integration status of a changelist, do one of the following:

  • To mark a changelist as Integrated, select it and click the Mark As Merged button markAsMerged on the Merge Info pane toolbar.
  • To mark a changelist as Not integrated, select it and click the Mark As Not Merged button markAsNotMerged on the Merge Info pane toolbar.
Last modified: 28 November 2017

See Also