If two lines are different, trailing whitespaces are not highlighted in the By word mode. If two lines differ in trailing whitespaces only, these lines are considered equal. Trim whitespaces: trim whitespaces if they appear in the end and at the beginning of a line ( ("\t", " ")). You cannot edit files that have read-only status.ĭefine how the differences viewer should treat whitespaces.ĭo not ignore: white spaces are important, and all the differences are highlighted. You can edit only local versions of your files. You can change text only in the right-hand part of the side-by-side viewer, or in the lower line in the unified viewer. You can edit code and perform the Accept, Append, Revert actions in both viewers. The side-by-side mode has two panels, the unified mode has one panel.
Select a viewer mode: side-by-side or unified. The caret is placed in the same position as in the Differences Viewer. This action is only available when you review changes to multiple files. These controls are only available if more than one file has been modified locally.ĭisplay all changed files in the current change set and navigate to them.
#PHPSTORM DIFF TWO FILES UPDATE#
This behavior depends on the Go to the next file after reaching last change option in the Differences Viewer settings.Ĭompare the local copy of the previous or next file with its update from the server. When the last or the first difference is reached, PhpStorm suggests clicking the arrow buttons or pressing F7/ Shift+F7 once more and comparing other files modified locally. Previous Difference / Next Difference Shift+F7 F7
0 kommentar(er)
