Resolve conflicts. You
can resolve conflicts in the following ways: Discard work area changes,
keep work area changes, or ignore files you do not want to control.
Discard work area changes 
Select
this icon if you want to discard changes to specified files in your
work area. Additionally, if you discard a directory, the directory
and all of its members are discarded from your work area. In both
cases, the files and directory are replaced in your work area with
the latest database version.
Keep work
area changes 
Select
this icon if you want to sync changes to a directory and files in
your work area with the database. A sync operation might bring new
files into the database because a file that is in your work area,
but not in the database is added to the database.
Ignore
files you do not want Synergy to control
If
you see conflicts for files that you do not want to control, you can
ignore files by pattern. Doing this sets filters to keep files with
specified patterns from displaying as conflicts after you sync the
work area.
If the work area contains many conflicts,
you can filter the conflicts. Click
and choose the criteria
that you want to view (which filters out the rest of the criteria),
such as File, then use the list box to specify the conflict
messages you want to view. To see all conflicts again, click
and choose Turn
Off Filtering.
If the column being
filtered has 10 or fewer unique values, then the filter value displays
in a list box. You can add an existing value; however, you can also
enter your own value into that field. If the column has more than
10 unique values, you can enter values in a text field to apply filtering.
For more information on using Java regular expressions to filter the
criteria, see Pattern matching and Rational Synergy.
If you set filters, refresh the output in the Work
Area Conflicts dialog box. Click
in the Work
Area Conflicts dialog box to run work area conflict detection
again.