If Alex decides not to merge the two parts, but instead wants to use his copy of optics.c, he uses the collision -reject command. Or, if he wants to use the copy of optics.c at the release level, he uses the collision -accept command.

vChecks the resultant copy of optics.c into his work area and builds it against the rest of the system.

vAfter he is satis®ed with the reconciled changes, he lets TeamConnection know that the previously discovered con¯ict is reconciled. Alex does this by completing the collision record that TeamConnection created when Alex attempted to integrate his copy of optics.c. He does the following:

teamc collision -reconcile -path optics.c -release robot_control -workarea 310 -altversion robot_control:2

Result

Alex is now ready to make his changes visible to the release. He can use either the GUI or the command line to integrate the work area.

He refreshes from the driver again. The integrate is permitted because a completed collision record exists for the con¯ict between the two versions of optics.c. However, if Ken or Joy had integrated a new version of optics.c while Alex was busy resolving the last collision, Alex's driver add would fail. He would have to repeat the collision resolution process.

76User's Guide

Page 96
Image 96
IBM SC34-4499-03 manual Result