From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org, lekktu@gmail.com
Subject: Re: splitting ChangeLogs
Date: Wed, 06 Apr 2011 12:53:21 -0400 [thread overview]
Message-ID: <jwvtyebtj98.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <83hbabv1ol.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 06 Apr 2011 18:28:58 +0300")
>> > 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.
> What conflicts? there are no conflicts (assuming you have the
> changelog_merge plugin).
Well, in my view, the changelog_merge plugin resolves conflicts
resulting from a merge more than it performs a merge, but I don't know
if the implementation matches my mental image of it.
Stefan
next prev parent reply other threads:[~2011-04-06 16:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-06 1:49 splitting ChangeLogs Juanma Barranquero
2011-04-06 3:00 ` Eli Zaretskii
2011-04-06 3:24 ` Juanma Barranquero
2011-04-06 9:19 ` Eli Zaretskii
2011-04-06 11:18 ` Juanma Barranquero
2011-04-06 3:43 ` Stephen J. Turnbull
2011-04-06 9:20 ` Eli Zaretskii
2011-04-06 9:39 ` Stephen J. Turnbull
2011-04-06 12:23 ` Eli Zaretskii
2011-04-07 0:36 ` Stephen J. Turnbull
2011-04-07 3:03 ` Eli Zaretskii
2011-04-07 5:10 ` Stephen J. Turnbull
2011-04-06 4:01 ` Glenn Morris
2011-04-06 4:58 ` Stephen J. Turnbull
2011-04-06 5:05 ` Leo
2011-04-06 9:11 ` Eli Zaretskii
2011-04-06 9:14 ` Eli Zaretskii
2011-04-06 15:21 ` Stefan Monnier
[not found] ` <83hbabv1ol.fsf@gnu.org>
2011-04-06 16:53 ` Stefan Monnier [this message]
2011-04-06 18:08 ` Eli Zaretskii
2011-04-06 11:15 ` Juanma Barranquero
2011-04-06 17:22 ` Glenn Morris
2011-04-06 15:19 ` Stefan Monnier
2011-04-06 15:21 ` Juanma Barranquero
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvtyebtj98.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=lekktu@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.