Changelists
for Windows and Linux
for macOS
Ctrl+Alt+S 
Item | Description |
|---|---|
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 tracking | Select this option to protect files in inactive changelists and choose one of the options below. |
Show conflict resolving dialog | If this checkbox is selected, MPS displays the Resolve Changelist Conflict dialog on an attempt to modify a file. Select how you want to resolve conflicts before you proceed with the changes: |
Highlight files with conflicts | If this checkbox is selected, MPS 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. |
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. |