[Top][All Lists]

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

Re: Abolishing ChangeLog files

From: Steve Youngs
Subject: Re: Abolishing ChangeLog files
Date: Sat, 30 Mar 2013 09:06:32 +1000
User-agent: Gnus/5.130006 (Ma Gnus v0.6) SXEmacs/22.1.15 (Goggomobil, linux)

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


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

reply via email to

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