[Top][All Lists]

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

Re: Abolishing ChangeLog files

From: John Wiegley
Subject: Re: Abolishing ChangeLog files
Date: Fri, 29 Mar 2013 14:20:12 +0000
User-agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3 (darwin)

>>>>> Steve Youngs <address@hidden> writes:

> Your method does nothing to alleviate the problem of recurring conflicts on
> the ChangeLog files.  Because of their very nature and purpose the ChangeLog
> files get the most conflicts.  Normally very easy to resolve, but still, a

Steve, Git does support "drivers" for its merge algorithm, for specialized
data types that might otherwise be prone to constant conflicts.  See:



reply via email to

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