Conflict occurs while simple merge

Hi,

I am using WinCVS version 2.0.2.4 (Build 4) along with CVSNT server 
version 2.5.03. Both server and client is on different VM on Windows 
XP Professional. Well, my working copy is on netrwork drive for both 
user.

When I try to uopdate the changed in my local working copy to merge 
changes done by other user, I always get merge conflict. Though the 
changes done by other user is very simple, wincvs cannot merge it at 
all. Is there any setting on CVS server or WinCVS client which I need 
to use.

Following is the example of what I am doing with 2 diffrent user viz. 
User1 and User2. 

1 - User1 has created a new file File1.sql and commited in the CVS 
Server
2 - User2 checks out this file in the working directory.
3 - User2 adds anew line in the file and checks in
4 - User1 updates the local copy.
5 - Changes gets merged into working copy of User1.

Now if I follow same steps before updating the local copy of User1 but 
User1 makes some changes in the local copy, User1 always gets the 
conflict problem.

Anyone have any idea what is going wrong???




 
Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/cvsgui/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/cvsgui/join
    (Yahoo! ID required)

<*> To change settings via email:
    mailto:[email protected] 
    mailto:[email protected]

<*> To unsubscribe from this group, send an email to:
    [email protected]

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/