CLion 2017.3 Help

Viewing Merge Sources

For Subversion, the common Viewing Change History functionality is expanded with the possibility to view which revisions have been used in merges applied to a file. Merge sources can be presented as a tree of revisions.

To view the merge source

  1. Open the Version Control tool window, and switch to the Repository tab.
  2. Select the required changelist, and then choose a file from this changelist in the Changed Files pane.
  3. Select Show History from the context menu, or click /help/img/idea/2017.3/iconShowHistory.png on the toolbar. The History tab for the selected file will be displayed. For each revision, the Merge sources field shows the revisions that were used as sources for the merge.
    /help/img/idea/2017.3/mergeSourcesHistory.png
  4. To view all paths affected by a merge, select the relevant row and press Shift+Alt+A or click /help/img/idea/2017.3/showAffectedFiles.png on the toolbar.

    Review affected paths in the dialog that opens:

    /help/img/idea/2017.3/pathsAffected.png
Last modified: 24 October 2017

See Also