PhpStorm 2017.3 Help

Integrating Differences

You may need to integrate the contents of different versions of a file, for example integrate changes from a certain branch into your local copy.

To integrate changes into your working copy, do the following:

  1. Select the desired file and compare it with a version.
  2. In the Differences Viewer, use the chevron buttons icon InsertReplace icon InsertReplace2 for any block of lines that existed in the read-only copy and were changed or deleted in your local copy. If you keep the Ctrl key pressed, the chevron buttons turn into arrowLeftDown arrowRightDown. Click these buttons to apply changes to the current local version of the file.
    mergingChanges
Last modified: 6 December 2017

See Also