[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Cannot commit after mergeing a branch to main

From: Rohan Nandode
Subject: Re: Cannot commit after mergeing a branch to main
Date: Fri, 20 Aug 2004 10:43:49 +0530
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.1) Gecko/20020830

As the commit error message and status command suggests, when you merged file into the trunk, it resulted into some conflicts. You need to resolve those before you commit.

May be cvsnt mailing list will give you more relevent answer.


Nishad wrote:
After merging a branch to the main trunk, I am unable to commit
some files. I got the following error while trying to commit the file.
(This is happening only to the new files created in the branch and
Generated in the working folder after the merge process.)

cvs commit -m "Merged from brach_b on main trunk" Editxxx.asp cvs server: Up-to-date check failed for `Editxxx.asp'
cvs [server aborted]: correct above errors first!

Please help. I am using CVSNT on Win2K platform.

When I checked the status, it is showing as below.
File: Editxxx.asp       Status: Unresolved Conflict



Info-cvs mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]