PhpStorm 2024.1 Help

Diff & Merge

On this page, specify the default behavior of the Diff Viewer.




Context lines

Use the slider to specify the number of context lines that will not collapse, when in the Diff Viewer you click the button Collapse all to collapse the unchanged fragments.

Go to the next file after reaching last change

If this checkbox is selected, PhpStorm will suggest to press F7 or Shift+F7 once more and compare other files


Automatically apply non-conflicting changes

If this checkbox is selected, the interactive merge tool automatically merges all non-conflicting changes.

This is an equivalent to clicking Apply not conflicts in the Merge dialog.

Highlight modified lines in gutter

Select this checkbox if you want added/modified lines (relative to the base revision) to be highlighted in the gutter of the Merge dialog.

Last modified: 11 February 2024