[cvsnt] Re: Merge problem from trunk to branch

[Bo Berglund]

On Tue, 13 Sep 2005 04:57:01 +0100 (BST), Deepu Thomas
<cvs_bug at yahoo.co.in> wrote:

>Hi
> 
>I am trying to merge trunk to the branch ..but the latest update of the trunk gets overwritten in the latest update of the branch rather than merging .The command that i used is 
> 
>cvs update -j <branch name> -j HEAD 
> 
>The CVS version that i am using is 2.0.0.2 ...but not working :(
>Tried also in Tortoise CVS ..its the same problem ...
> 
>Can some one please help me out why this is happening !!!..What is the cause of suhc a nature ....
> 

Did you first update the sandbox to the branch??
Files that are non-text cannot be merged.


/Bo
(Bo Berglund, developer in Sweden)