PhpStorm 2018.1 Help

Changelists

File | Settings | Version Control | Changelists for Windows and Linux
PhpStorm | Preferences | Version Control | Changelists for macOS
Ctrl+Alt+S settings


ItemDescription
Track changed blocks in text files separately Select this option if you want to be able to put changes to one file into separate changelists to commit them separately (see Commit part of a file for details)
Enable changelist conflict trackingSelect this option to protect files in inactive changelists and choose one of the options below.
Show conflict resolving dialogIf this checkbox is selected, PhpStorm displays the Resolve Changelist Conflict dialog box on an attempt to modify a file.

Select how you want to resolve conflicts before you proceed with the changes:

  • Shelve changes.
  • Move file to the active changelist.
  • Switch changelists to make the current changelist active.
  • Ignore conflict. In this case, the file in question will be added to the list of files with ignored conflicts.
Highlight files with conflictsIf this checkbox is selected, PhpStorm shows a yellow stripe on top of a file from an inactive changelist, when such file has been modified.

It lets you choose one of the possible ways to resolve conflicts:

  • Move file to the active changelist.
  • Switch changelists.
  • Ignore conflict.

The names of the files belonging to inactive changelists are shown in red font in the editor tabs and in the Project view.

Highlight files from non-active changelistsIf this checkbox is selected, names of the files belonging to inactive changelists are shown in light-blue font in the editor tabs and in the Project view.
Files with ignored conflictsThis area shows the list of files for which the Ignore option has been selected in the Resolve Changelist Conflict dialog box or in the editor stripe.
ClearClick this button to remove all files from the list of files with ignored conflicts.
Last modified: 1 June 2018

See Also