Copy-Modify-Merge Example (Sun WorkShop TeamWare 2.1 User's Guide)

Sun WorkShop TeamWare 2.1 User's Guide

Copy-Modify-Merge Example

The following is a Copy-Modify-Merge concurrent development model employed by TeamWare Configuring. This example describes a common software development scenario where two developers are working simultaneously on the same or related parts of a project.

Table 3-1 Copy-Modify-Merge Example


	Both you and Developer x copy the same file from the project integration area to your separate work areas.
	Developer x changes the file and copies the changed file back into the integration area.
	You modify the same file in your work area and attempt to copy the file back into the integration area. TeamWare Configuring blocks your attempt to copy since it would overwrite Developer x's changes.
	Configuring informs you of the conflicting changes and you copy the file containing Developer x's changes from the integration area to your work area.
	With Configuring's assistance, you resolve the conflicts, merge the changes, test the changes, and successfully copy the file back to the integration area.