Changelists

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)

Show dialog on attempt to edit file from non-active changelist

If this option is selected, PhpStorm displays the Resolve Changelist Conflict dialog on an attempt to modify a file from a non-active changelist.

Select one of the following options:

• Shelve the changes (see Shelve changes for more information).

• Move changes to active changelist.

• Switch to changelist: the current changelist will be made active.

• Ignore: the file will be added to the list of files with ignored conflicts.

Highlight files with changelist conflicts

If this option 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 changelists

If 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 conflicts

This area shows the list of files for which the Ignore option has been selected in the Resolve Changelist Conflict dialog or in the editor stripe.

Clear

Click this button to remove all files from the list of files with ignored conflicts.