IBM SC34-4499-03 Personal Computer User Manual


 
Command
From a command line, she issues the following command:
teamc workarea -integrate 415 -release robot_control
Result
Because Jenny is up-to-date with the latest view of the driver, her changes are
integrated after TeamConnection preserves a copy of the previous version of the
release.
Reconciling differences
Later, Alex is ready to integrate his modifications. Alex issues a refresh command from
the driver, as Jenny did (see page 71 for instructions).
This time, Alex receives a message that collision records were generated, because both
he and Jenny have updated the same parts. At this time he does not know which parts
collided. TeamConnection refreshes work area 310 with the exception of the part
optics.c, which had the collision. Alex’s work area shows the following parts:
brain.c (Jenny's modification 3)
brain.obj (Jenny's modification 3)
brain.exe (Contains Alex's modification 5)
arm.c
arm.obj
hand.c (Joy's modification, Ken's modification)
hand.obj (Joy's modification, Ken's modification)
leg.c
leg.obj
foot.c
foot.obj
optics.c (Alex's modification 5)
optics.obj (Alex's modification 5)
Figure 22. Integrate Work Areas window
Chapter 5. Working with no component or release processes 73