Re: Update/merge conflict question

[Larry Jones]

James Knowles writes:
> 
> When I do a 'cvs update' and there are conflicts, diff-like text is put into
> the text.

What would you have it do instead?

> Is there some way to prevent this without preventing the normal update
> merge, which is very nice? I don't always catch these conflicts on a large
> project until I try to compile and the compiler barfs on the diff text. 

That's a feature -- it pretty much forces you to notice conflicts.

> It'd also be nice to use a visual merge tool to resolve these rather than
> hack the text. 

Yes, it would; I belive there have been some patches posted here that
allow you to specify alternative merge tools.

-Larry Jones

Oh, what the heck.  I'll do it. -- Calvin