[Top][All Lists]

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

Merging files added on a branch?

From: Paul Spain
Subject: Merging files added on a branch?
Date: Mon, 14 May 2001 18:25:44 +1000

Hi there,

Is there a _nice_ (command-based) way to merge files added on a branch back to
the trunk. I get messages like this when I try to merge back to the trunk:
cvs server: warning: KeyWords.pas is not (any longer) pertinent
cvs server: file KeyWords.pas exists, but has been added in revision

Thanks, Paul.

reply via email to

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