Create changelists automatically
Select this option if you want DataGrip to create new changelists automatically. For example, on Cherry-pick and Revert commit actions. Also, in Unshelve..., Apply patch..., and Revert... dialogs DataGrip will offer you to select a target changelist.
Allow putting changes within one file into different changelists
Select this option if you work on a few tasks within one file and want to put a few changes within it into different changelists.
Highlight files from inactive changelists
If you select this checkbox, DataGrip shows names of the files belonging to inactive changelists in light-blue font in the editor tabs and in the Project view.
Show dialog on attempt to edit file from inactive changelist
If you select this option, DataGrip displays the Resolve Changelist Conflict dialog on an attempt to modify a file from a non-active changelist.
Select one of the following options:
When an empty changelist becomes inactive
In this section, specify whether you want to remove inactive changelists silently or not. The following options are available:
Highlight files with changelist conflicts
If you select this option, DataGrip 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:
The names of the files belonging to inactive changelists are shown in red font in the editor tabs and in the Project view.