Considering whether to resolve conflicts
Not all conflicts are bad. Rational Synergy can
detect 24 different conflicts, most of which are shown by default.
Before you resolve conflicts, ask your build manager to find out which
conflicts must be resolved.