ConflictManager Reference
24
Setting Up ConflictManager
during conflict detection. The left list boxes contain key structure, and the right list
boxes contain values.
Note
The upper-left list box contains information for all packages, even if a package group is
selected in the Groups pane.
To exclude registry keys from conflict detection
1. Select Setup menu > Conflict Settings.
The Conflict Settings dialog box appears.
2. Click the Registry Keys tab.
3. In the upper-left list box, navigate to a registry key or value.
To ignore an entire tree, select the key in the upper-left list box and click Add
Tree.
To ignore a value, select the value in the upper-right list box and click Add
Value.
The registry key tree or value is added to the corresponding lower list box.
4. To define additional settings, see:
Defining Types of Conflicts to Detect
on page 19
Excluding Files and Directories From Conflict Detection
on page 22
5. Click OK on the Conflict Settings dialog box.
Note
If you delete a value from the lower-right list box and it makes the key empty, the
corresponding registry key subtree is still displayed temporarily but disappears after you
close the Conflict Settings dialog box.
Conflict Resolution Rules
The ConflictManager resolution rules let you resolve file conflicts automatically. Using
resolution rules saves time, reduces errors, and provides consistency in conflict
resolution.
After you detect conflicts, you resolve the conflicts according to a rule set you select.
The majority of conflicts can be resolved this way. If conflicts remain after resolving with
rules, use the Resolve wizard.
See:
Resolving File Conflicts With Rules
on page 39
Resolving File Conflicts Individually
on page 40
About Rule Sets
A rule set is a collection of rules. A rule consists of actions, conditions, and sort options.
z
An action states how a conflict will be resolved.
z
A condition determines the criteria that a conflict must meet in order for the action
to be performed. Example: If you select the condition Version differs, the Resolve
Содержание CONFLICTMANAGER
Страница 1: ...ConflictManager Reference ...
