From: Miles Bader <miles@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: changelog-merge plugin and edited ChangeLog entries
Date: Sun, 27 Feb 2011 07:52:06 +0900 [thread overview]
Message-ID: <87k4gmh0ix.fsf@catnip.gol.com> (raw)
In-Reply-To: <jwv8vx28tgo.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Sat, 26 Feb 2011 14:53:25 -0500")
Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> The gnulib "git-merge-changelog" merge program[*] is reported to
>> handle this case correctly, and supposedly can be used with either git
>> or bzr (or hg).
>
> I haven't had too many problems related to this with change-log-mode's
> change-log-resolve-conflict either.
The nice thing about git-merge-changelog though is that it will handle
automatically for bulk merges (though apparently not for bzr), without
the user needing to get involved at all.
-Miles
--
XML is like violence. If it doesn't solve your problem, you're not
using enough of it.
next prev parent reply other threads:[~2011-02-26 22:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-26 8:04 changelog-merge plugin and edited ChangeLog entries Eli Zaretskii
2011-02-26 8:45 ` Miles Bader
2011-02-26 8:52 ` Eli Zaretskii
2011-02-26 19:53 ` Stefan Monnier
2011-02-26 22:52 ` Miles Bader [this message]
2011-02-27 3:57 ` Eli Zaretskii
2011-02-27 5:07 ` Miles Bader
2011-02-26 19:33 ` Glenn Morris
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=87k4gmh0ix.fsf@catnip.gol.com \
--to=miles@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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.