info-cvs
[Top][All Lists]
Advanced

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

Problem in merge in cvs


From: ramanuj singh
Subject: Problem in merge in cvs
Date: Sat, 14 Aug 2004 19:52:12 +0530
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.2.1) Gecko/20030225

Hi,
I am facing a wierd problem. There is a branch on main trunk i.e. dev branch. In this branch different developer create their branches and merge their each branh into main trunk after completing their task. Developers are using Tortoise CVS as their tool. When a developer merges his branch after one developer has already merged his branch into dev branch instead of file getting update with the another merge get overridden by the file of last developer who has merged the file.

Regards,
Ramanuj Singh





reply via email to

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