[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Update/merge conflict question
From: |
Paul Sander |
Subject: |
Re: Update/merge conflict question |
Date: |
Sun, 2 Dec 2001 02:16:00 -0800 |
On September 16, 2001, I posted a patch to CVS that replaced its built-in
merge algorithm with an extensible mechanism. The context of that patch
was to provide better merge support for non-ASCII files, but it would
serve your needs quite well also.
Search an archive of this list for the following message ID:
address@hidden
>--- Forwarded mail from address@hidden
>When I do a 'cvs update' and there are conflicts, diff-like text is put into
>the text.
>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.
>It'd also be nice to use a visual merge tool to resolve these rather than
>hack the text.
>--- End of forwarded message from address@hidden