Professional Documents
Culture Documents
3 Way Merge Diagram
3 Way Merge Diagram
merge.
Thedeveloperperformsthefollowingsteps:
1. Checksoutprojectsfromthemasterrepository,whichisstoredintheshared
multiuserdirectory.Anunalterablecopyofthecheckedoutrepository
(or i gi nal . r pd)isautomaticallyretainedbythesystemforuseduringthe
merge.
2. Makeschangesinthelocal(current)versionoftherepository.Themodified
repositorycontainschangesbyotherdevelopersbetweencheckoutandmerge.
3. Mergesthelocalchanges.Theoriginalmasterrepositorymayhavechanged
throughconcurrentdevelopmentsincecheckout.Acopyofthelatestmaster g p py
repository(modified)isautomaticallyretrievedbythesystemandcompared
withthecurrentandoriginalrepositoriesinathreewaymerge.Themodified
masterrepositoryisautomaticallylockedbythesystemtopreventissuesduring
merge.Ifthereareanyconfigurationconflictsduringthemerge,thedeveloper
resolvesthemmanually.
4. Publishesthenewmasterrepositorytothenetwork.Thesystemautomatically
moves the merged repository to the shared multiuser directory and removes the movesthemergedrepositorytothesharedmultiuserdirectoryandremovesthe
locks.Themergedrepositoryisthenewmasterrepository.