Each team member has an Eclipse IBM® Rational® Team Concert workspace
connected to the IBM Jazz™ Team Server and
works with IBM Rational Rhapsody® projects
that are acquired from the repository.
When a team member initiates acceptance
of changes made by other team members, IBM Rational Team Concert replaces
the local Rational Rhapsody units
with ones fetched from the repository. However, if you have already
modified some of these Rational Rhapsody units, Rational Team Concert merges
local and incoming units. IBM Rational Rhapsody DiffMerge
is used to perform the merge.
When Rational Team Concert detects
that some of the local units cannot be replaced with new ones, it
reports a conflict and it gives you the opportunity to try to merge
automatically or to merge later. The following options are possible.
- Auto-Merge. In this case, Rational Team Concert launches Rational Rhapsody DiffMerge
and, if it is possible, automatically merges differences in silent
mode. However, if there are any conflicts from the Rational Rhapsody DiffMerge
perspective, Rational Team Concert displays
a message box stating that auto-merge is not possible for some of
the files and suggests you do the merge manually for them. All units
that could not be merged automatically are put into the Rational Team Concert Merge
required list, for which you must do a manual merge.
- Merge Later. When you click this button,
whatever that can be replaced is replaced (without having to open Rational Rhapsody DiffMerge).
All conflicting units are put into the Rational Team ConcertMerge
required list. You need to manually merge them later. There might
be differences that can be auto-merged.
To merge units that were postponed (either due to the inability of Rational Rhapsody DiffMerge
to merge them automatically or because you decided to merge conflicts
later), you can right‑click Merge required in Rational Team Concert and
select Open in compare editor to open the Compare
Editor window. - You can then try to merge the conflicts automatically
by clicking the Auto‑Merge button (to call Rational Rhapsody DiffMerge
in silent mode).
- You can click the Invoke Rhapsody DiffMerge
to compare or merge manually button so that you can resolve
conflicts by merging manually. You must save your changes in Rational Rhapsody DiffMerge
and click the Resolve as Merged button to commit
the results when you return to the Compare Editor window.
For more information about this product, see
the topic on developing in parallel with Rational Rhapsody DiffMerge.