From: Eli Zaretskii <eliz@gnu.org>
To: Claudio Bley <claudio.bley@googlemail.com>
Cc: emacs-devel@gnu.org
Subject: Re: [PATCH v2 0/5] fixes for w32 and NetPBM
Date: Fri, 01 Nov 2013 13:24:45 +0200 [thread overview]
Message-ID: <83ob64bc02.fsf@gnu.org> (raw)
In-Reply-To: <87d2mkz9w0.wl%claudio.bley@gmail.com>
> Date: Fri, 01 Nov 2013 11:36:31 +0100
> From: Claudio Bley <claudio.bley@googlemail.com>
> Cc: emacs-devel@gnu.org
>
> > In the future, please also provide ChangeLog entries for your
> > changes. (I wrote them this time.)
>
> OK, will do. But, I'm curious, how do you cope with the merge
> conflicts popping up for each patch? Do you resolve them manually each
> time?
There are no ChangeLog merge conflicts, not with bzr. Bzr resolves
ChangeLog issues automatically.
Anyway, you don't need to send the log entries as diffs, you can just
send them as part of the text portion of your patch. Copy/yank is
simple enough.
prev parent reply other threads:[~2013-11-01 11:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-30 12:42 [PATCH v2 0/5] fixes for w32 and NetPBM Claudio Bley
2013-11-01 9:12 ` Eli Zaretskii
2013-11-01 10:36 ` Claudio Bley
2013-11-01 11:24 ` Eli Zaretskii [this message]
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83ob64bc02.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=claudio.bley@googlemail.com \
--cc=emacs-devel@gnu.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).