PyCharm 2016.3 Help

Diff & Merge

File | Settings | Tools | Diff & Merge for Windows and Linux
PyCharm | Preferences | Tools | Diff & Merge for OS X


On this page, specify the default behavior of the Differences viewer.

Context linesUse the slider to specify the amount of context lines that will not collapse, when in a Differences viewer you click the button /help/img/idea/2016.3/collapseAll.png to collapse the unchanged fragments.
Go to the next file after reaching last changeIf this check box is selected, PyCharm will suggest to click F7/ Shift+F7 once more and compare other files
Automatically apply non-conflicting changesIf this check box is selected, the interactive merge tool automatically merges all non-conflicting changes.

This is an equivalent to clicking /help/img/idea/2016.3/applyNotConflicts.png in the Merge dialog.

Highlight modified lines in gutterSelect this check box if you want added/modified lines (relative to the base revision) to be highlighted in the gutter of the Merge dialog.

See Also

Last modified: 23 December 2016