About this task
- If there are no differences between the workspace
unit and the remote, a message box tells you that there are no changes
between the workspace resource and the remote.
You can
update your IBM® Rational Rhapsody unit
to match the repository.
- If this message does not appear when you synchronize
with the repository, it means that there are some differences between
the workspace unit and the corresponding repository unit. This means
either you modified this unit or somebody else has committed some
changes on this unit to the repository or both. In this case, you
can click the Invoke Rhapsody DiffMerge to compare and
merge manually button to launch IBM Rational Rhapsody DiffMerge.
After you merge, right-click the unit and select Mark as
Merged.
If a Rational Rhapsody unit
is out‑of‑sync with the repository, one of the following overlays
appears on the icon for the unit:
means that you have created
this unit and it is not added to the repository yet (outgoing new
file)
means that the repository
contains this new unit that does not exist in your workspace (incoming
new unit)
means that this unit
is changed in your workspace (outgoing modification)
means
that this unit is changed in the repository (incoming modification)
means that this unit
is modified both in the repository and in your workspace so there
is a conflict