[cvsnt] Yet another obscure merge problem

[Tony Hoyle]

On Fri, 27 Feb 2004 15:20:25 -0000, "Harrison, Andrew"
<andy.harrison at anite.com> wrote:

 
>> Does the -f option to update change things?  It's one of those options
>> that normally doesn't seem to have a lot of point but might work in
>> your case.
>
>I'll have a go, what does it do?
>
It makes CVS assume that nonexistant branches exist on the HEAD rather
than elsewhere...  It might give a better outcome in your case.

Tony