Re: Abolishing ChangeLog files

[Steve Youngs]

* John Wiegley <address@hidden> writes:

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

Wow, there is just so much more to Git than meets the eye.  I had no
idea about this, thanks for showing me, John.

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
|       SXEmacs - The only _______ you'll ever need.       |
|         Fill in the blank, yes, it's THAT good!          |
|------------------------------------<address@hidden>---|