[Top][All Lists]

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

Re: Abolishing ChangeLog files

From: Eli Zaretskii
Subject: Re: Abolishing ChangeLog files
Date: Fri, 29 Mar 2013 12:16:48 +0300

> From: Steve Youngs <address@hidden>
> Date: Fri, 29 Mar 2013 18:02:40 +1000
> Keywords: method,information,problem,place,logging
> Your method does nothing to alleviate the problem of recurring conflicts
> on the ChangeLog files.

These conflicts only happen if changes are applied manually with
'patch' or similar.  When merging between branches, bzr handles
ChangeLog files specially, and avoids conflicts caused by addition of

reply via email to

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