Hi,
I am currently working on a Branch of a Branch of Main Tree, and I am
required to submit my changes to main tree now, without distrubing the
intermediate branch. I am new to using the CVS, and cannot experiment as
the time limit is very close, and I can not afford to make mistake.
For your understanding, I am explaining the problem graphically:
Main_Tree------------------------>
|_________.Branch X
|________________> Branch Y
Branch X is a stable release.. and I cannot change any files in that.
I am working on Branch Y.
I want to merge my changes to Main Tree.. which has gone heavily changed
after the Branch X.
Please suggest the way to do this.
Quick and reply containing commands are highly appreciated ..as I am a new
to CVS.
Though any slightest hint is also required and appreciated.
Thankx in advance.
Rana.
