Re: make change-history on non-master branches

[Eli Zaretskii]

> From: Andreas Schwab <address@hidden>
> Cc: David Engster <address@hidden>,  address@hidden,  address@hidden,  
> address@hidden
> Date: Thu, 19 Nov 2015 17:35:44 +0100
> 
> >> >> Quite possibly. I don't know exactly what happens if the commit hash
> >> >> from the ChangeLog.2 footer were to get merged between branches.
> >> 
> >> You get a merge conflict.
> >
> > Even if I have git-merge-changelog installed?
> 
> I don't know, but I would be surprised if it could handle that
> correctly.

Yes, that's exactly what I'm afraid of: a conflict-less merge that
does the wrong thing.

Thanks.