Accepting changes and resolving conflicts by using Rational Team Concert

Each team member has an Eclipse IBM® Rational® Team Concert workspace connected to the Jazz™ Team Server and works with 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. 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.


Feedback