[Top][All Lists]

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

merge just overwriting?

From: Sagi Brody
Subject: merge just overwriting?
Date: 9 May 2002 18:03:01 -0700

        I just started using CVS. I imported my software as follows:
the development version of my sofware as the main trunk
the stable latest release as a branch

When I modify files in the branch and attempt to merge them into the
trunk (cvs update -j stable filename.c) it seems the file in the trunk
is just overwritten with the file from the branch? I also tried using
2 -j's and it did the same thing. I'm using cvs 1.11. Any help is
greatly appreciated..

reply via email to

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