We will now use the Synchronize view to update our local resource
to the latest contents in the repository contents and to commit our changes.
- Confirm that the Synchronize view is in Incoming
Mode (#1). If not then press the Incoming Mode button on the local toolbar
(#2).
- Select file1.txt (the incoming change). The comparison viewer shows that the
repository copy of file1.txt has a new line inserted (Fred-update).
-
From the context menu of file1.txt choose Update.
This will cause your Workbench to be updated with the repository copy of
file1.txt.
- Select file2.txt. The comparison viewer shows that the repository copy of
file1.txt and our copy of file1.txt have both had the exact same line
modified.
- If you are suspicious of the change you may want to find out some more information
about the change. To do this you first need to figure out who made the change
and why.
In the Structure compare pane of the Synchronize view select file2.txt and choose Show in Resource
History from the context menu.
- In the Resource History view (see above) we can see there is a * next to
version 1.8. This indicates 1.8 is currently in our Workbench. We can also
see the repository contains 1.9 of file2.txt. The author of 1.9 is Fred.
Looks like it's time to ask Fred why he was changing file2.txt.
If Fred had entered a meaningful description when releasing his changes,
these descriptions would have appeared in the comment field of the Resource
History view thereby providing us with some insight into the intent of the change.
- You can use the four copy buttons to help you
merge in conflicting changes made to the repository.
For now we will assume that Fred's change turns out to be the right change.
Select file2.txt and choose Override and Update from the context menu.
When asked to confirm the replacement choose Yes.
- The Update mode no longer has any remaining
incoming or conflicting changes.
Looking at the status bar we can see there is still one remaining outgoing
change to deal with.
Committing
Synchronize view