Re: Should we restore manually maintained ChangeLogs

[Eli Zaretskii]

> Cc: address@hidden, address@hidden, address@hidden
> From: Paul Eggert <address@hidden>
> Date: Wed, 9 Mar 2016 10:34:46 -0800
> 
> On 03/09/2016 10:27 AM, Eli Zaretskii wrote:
> > If you don't do merges, you won't ever see merge conflicts.
> 
> I saw conflicts all the time when rebasing or applying patches. Perhaps 
> these weren't "merge conflicts" in some technical sense, but they were 
> just as much a hassle.

git-merge-changelog supports rebase and cherry-picks as well.  So your
assumption that it won't help you is based on a mistake.

As for applying patches, just don't apply the ChangeLog hunks.