#Compare word documents for changes mac update#
#Compare word documents for changes mac code#

Note that Base refers to the file version that the local and the repository versions originated from (initially displayed in the middle pane), while Middle refers to the resulting version.Ĭlick this button to apply all non-conflicting changes. Press Ctrl to change or to or and append changes.Ĭlick this icon to invoke the list of options allowing you to compare different versions of a file to resolve a conflict. The chevron buttons can change their behavior:Ĭlick and to apply changes. The active pane has the cursor.Īpply differences between panes (in case of the side-by-side viewer) or between lines (in case of the unified viewer). Switch between the panes of the differences viewer. Open a browser and show the corresponding help page. Select this checkbox if you want to include the file you've reviewed into the commit. This checkbox only appears if you invoke the Differences Viewer from the Commit Changes dialog with multiple changed files (all of which are deselected), and you explore the differences between them and hit the last difference in a file. These commands are also available from the context menu of the differences viewer gutter. If this button is released, each of the panes can be scrolled independently. To open the Diff & Merge page, open settings by pressing Ctrl+Alt+S and navigate to Tools | Diff & Merge.Ĭlick this button to scroll both differences panes simultaneously. The amount of non-collapsible unchanged lines is configurable in the Diff & Merge settings page. In such cases, highlighting might introduce additional difficulties during a review.Ĭollapse all the unchanged fragments in both files. Use the Do not highlight option when you work with the files that were significantly modified. Highlight symbols: modified symbols are highlightedĭo not highlight: if this option is selected, the differences are not highlighted at all. Highlight split changes: if this option is selected, big changes are split into smaller changes.įor example, A B and A X B X are treated as two changes instead of one.

Highlight lines: modified lines are highlighted Highlight words: modified words are highlighted Select the way differences granularity is highlighted. Ignore imports and formatting: changes within import statements and whitespaces are ignored (whitespaces within String literals are respected though). The following entities are ignored:Īll whitespaces (as in the 'Ignore whitespaces' option)Īll added or removed lines consisting of whitespaces onlyĪll changes consisting of splitting or joining lines without changes to non-whitespace parts.įor example, differences between a b c and a b c are not highlighted in this mode. Ignore whitespaces and empty lines: ignores whitespaces and empty lines. Ignore whitespaces: white spaces are not important, regardless of their location in the source code. 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 ( (' ', ' ')). 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.

#Compare word documents for changes mac code#

You can edit code and perform the Apply, 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.

#Compare word documents for changes mac update#

This behavior is supported only when the Differences Viewer is invoked from the Commit tool window Alt+0.Ĭompare Previous/Next File Alt+Left Alt+RightĬompare the local copy of the previous or next file with its update from the server. This behavior depends on the Go to the next file after reaching last change option in the Differences Viewer settings. When the last or the first difference is reached, IntelliJ IDEA 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