IntelliJ IDEA 2017.1 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 /help/img/idea/2017.1/icon_InsertReplace.png /help/img/idea/2017.1/icon_InsertReplace2.png 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 /help/img/idea/2017.1/arrowLeftDown.png /help/img/idea/2017.1/arrowRightDown.png. Click these buttons to apply changes to the current local version of the file.

See Also

Last modified: 18 July 2017