[Top][All Lists]

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

Re: ChangeLog and the release branch

From: Dmitry Gutov
Subject: Re: ChangeLog and the release branch
Date: Tue, 24 Nov 2015 15:29:30 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Thunderbird/42.0

On 11/24/2015 04:25 PM, Artur Malabarba wrote:

I thought if we just generated the changelogs independently for each of
the branches we would be fine (i.e., don't merge to master the changelog
commits on emacs-25).

I suppose gitmerge.el could try and ignore ChangeLog.2. But then any edits we make to the commit messages by changing ChangeLog.2 in emacs-25 branch, will be discarded with it.

reply via email to

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