Merge candidates

The merge candidates viewer helps you identify and define highly specific merge rules, and is only really intended to deal with exception cases that fall outside the scope of general rules.

It responds to the selection of a file item in either of the Merged files or Unmerged files viewers. Where no file is selected in either of these, it is empty.

As soon as a file is selected, it lists all candidate merge targets. In the simplest case, this is the list of all files in the code-base. However, by using the filter buttons on the toolbar, you can quickly reduce this to a much more manageable set:

Only show files that the merge source includes
Only show files that include the merge source
Only show .h files (as defined in the project properties)
Only show .c files (as defined in the project properties)
Only show files in the same directory
Only show files with the same local name
Only show files with a similar local name
Only show files that have not already received a merge target

To define a new (specific) merge rule, select the merge target in the list, and then choose the "add rule" button. Alternatively, just double-click the merge target.