Changelist Conflicts
for Windows and Linux
for OS X
⌃⌥S
Use this page to configure protection of files belonging to inactive changelists, from occasional conflicts.
Item | Description |
---|
Enable changelist conflict tracking | If this check box is selected, AppCode makes it possible to protect files in inactive changelists.
Such protection can be performed on the various levels enabled by the options listed below. |
Show conflict resolving dialog | If this check box is selected, AppCode shows Resolve Changelist Conflict dialog box
on an attempt to modify a file.
You need to define the way to resolve a conflict, before you
proceed with changes. The possible ways to resolve a conflict are as follows:
-
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 conflicts | If this check box is selected, AppCode shows a yellow stripe on top of a file from an inactive changelist,
when such file has been modified.
In this stripe, you can choose one of the possible ways to resolve conflict:
-
Move file to the active changelist.
-
Switch changelists.
-
Ignore conflict.
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 check box 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 Ignore option has been selected in the
Resolve Changelist Conflict dialog box, or in the editor stripe. |
Clear | Click this button to remove all files from the list of files with ignored conflicts. |
Last modified: 28 March 2017