Merging versions during the rebase operation

For any version you modify in your development stream, if another team member modified and delivered a version of the same element, you must merge when you rebase to a baseline that contains the delivered version. The following circumstances involve merging:

• As part of working on an activity, you check in a version of prog.c from your development view.
• Another developer checks in and delivers a new version of prog.c to the parent stream.
• Your project manager adds the new version to the recommended baseline.
• You rebase your development stream. As part of the rebase operation, you must merge the other developer's version into your development stream.

All nonconflicting (also called automatic) differences are merged. If versions in the baseline contain changes that conflict with the corresponding versions in your development work area, you are prompted to start Diff Merge so that you can resolve the conflicts.