[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Cvs merge problem
From: |
Rohan Nandode |
Subject: |
Re: Cvs merge problem |
Date: |
Thu, 19 Aug 2004 12:38:01 +0530 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.1) Gecko/20020830 |
Please send mail only in Plain Text format.
There are seven developers in the team. The problem developer facing is
when their branch is merged in to the development branch the files which
have been changed earlier or updated in the development branch gets
updated with the changes from the branch and some files show conflicts
but the file which has never been updated or touched by any developer
before in their branch is merged with some changes made by one developer
do not show changes in the development branch. The rest of the files
With my understanding of the problem....
If a developer has not changed a file in his branch then you don't see
merge or difference in his branch.
Can you identify what kind of changes those file shows when they are
merged into the main trunk?
BTW, why each developer has his own branch? Cann't they work on the
trunk simulataneously which is the advantage of CVS?
HTH
Rohan