Re: Auto Merge

[Larry Jones]

Ayers, Douglas D writes:
> 
> I am currently using Win CVS as the client to a CVS server located on a
> Linux Machine.  I would like to turn off the auto merge feature of CVS when
> I do an "update".  It would be much easier for me if CVS showed me which of
> the files I modified had been edited by others.  I could then use WinMerge
> to merge the files easily instead of having to deal with a file full of diff
> markers.

You generally don't get "a file full of diff markers" -- that only
happens when there are merge *conflicts*, which shouldn't happen very
often.  You can have update show you what it is going to do without it
actually doing it by using the -n global option:  cvs -n update.

-Larry Jones

What a stupid world. -- Calvin