Re: Abolishing ChangeLog files

[John Wiegley]

>>>>> 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
> PITA.

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

    
http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c

John