Sunday, August 10, 2008

CM: Branching & Merging...


Consider the example given in the figure. Code was checked out from the production environment on 1st of August, and Module 1 worked on till 5th of August when it is checked in again.

To fix Module 4, another copy of the code was checked out from the production environment at the same time as Module 1, and worked on till the 10th of August. The changes were then put back on 10th. Now what happens to the previous changes made to Module 1?

Our requirement is to carry out changes to both module 1 and module 4 and be able to retain them although they have been checked out on the same day and checked in on different days. Branching and Merging is therefore essential when working on CRs on different parts of code. Your CM tool must be able to branch out a version and be able to assimilate the changes (merge) at a later point of time!

No comments:

Post a Comment

Full capabilities of ChatGPT 4 O (O for Omni) - From Openai.com

Omni, O, has multimodal capabitlies, which means it can take text, voice or video as an input and serve audio/text/image output (there's...