AppCode
 
2021.2
Shortcuts: macOS
Get AppCode
You are viewing the documentation for an earlier version of AppCode.
  1. Work with source code
  2. Compare files and folders

Compare files, folders, and text sources

Last modified: 04 August 2021

AppCode lets you review the differences between any files, folders, text sources, or database objects, as well as between local files and their repository versions.

Compare files

AppCode displays the differences in the Differences Viewer for Files:

comparing files

To apply changes, use the chevron buttons apply left and apply right.

To append changes, press Ctrl — the apply left apply right buttons will turn into chevron button bottom right chevron button bottom left.

Compare two files

Compare active editor with Clipboard

Compare active editor with a project file

Compare active editor with any file

Compare a local file with its repository version

Productivity tips

Assign shortcuts for 'apply' and 'append'

To assign shortcuts to the apply and append actions, open the Keymap page of the IDE settings ⌃ ⌥ S and locate these actions under Version Control Systems | Diff & Merge.

Swap sides

When you are comparing two files, or a file with the Cliboard contents, you can swap sides by clicking the Swap Sides button on the toolbar.

Compare folders

AppCode lets you compare files in two folders against their file size, content, or timestamp. The differences are displayed in the Differences Viewer for Folders:

Comparing folders

The top pane lists all files in the selected folders, while the bottom pane shows the differences between two versions of the selected file (see Compare files).

note

You can also open the difference viewer without running AppCode. Run the following command: <path to AppCode executable file> diff <path_1> <path_2> where path_1 and path_2 are paths to the folders you want to compare.

Compare folders

Synchronize folders

Compare different files in two folders

Compare any text sources

Apart from comparing files' or folders' contents, you can open an empty Differences Viewer and paste any text or drag files into the right and left panels to compare. This can be useful, for example, if you want to compare an application's console output with the output of the same application albeit a little modified.

Productivity tips

Assign a shortcut for the 'Open Blank Diff' action

On the Keymap page of the IDE settings ⌃ ⌥ S, locate this action under Version Control Systems | Diff & Merge.

Swap sides

You can swap sides in the Diff Viewer by pressing the swap sides icon on the toolbar.

See also

Procedures

Reference

Concepts