[Top][All Lists]

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

Re: splitting ChangeLogs

From: Stefan Monnier
Subject: Re: splitting ChangeLogs
Date: Wed, 06 Apr 2011 11:21:28 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

> I thought the ChangeLog entries from the emacs-23 branch are merged
> manually.  If they are merged automatically, then you are right.

The merge is automatic, and the resulting conflicts can either be
resolved automatically (e.g. via smerge-resolve or a bzr plugin),
or manually.


reply via email to

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