From: Eli Zaretskii <eliz@gnu.org>
To: David Kastrup <dak@gnu.org>
Cc: bruce.connor.am@gmail.com, emacs-devel@gnu.org
Subject: Re: The ChangeLog and merge conflicts
Date: Tue, 10 Feb 2015 05:43:40 +0200 [thread overview]
Message-ID: <83lhk68m8j.fsf@gnu.org> (raw)
In-Reply-To: <871tlytyut.fsf@fencepost.gnu.org>
> From: David Kastrup <dak@gnu.org>
> Date: Tue, 10 Feb 2015 01:05:30 +0100
> Cc: emacs-devel <emacs-devel@gnu.org>
>
> Take a look for the git-merge-changelog program (the respective Debian
> package is called just that).
Indeed. I'm using it and I have zero conflicts in ChangeLog files.
next prev parent reply other threads:[~2015-02-10 3:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAAdUY-+7hjTB6k=nzC37_Dnm2VWe3tvworne6fmABRkpwjLdXw@mail.gmail.com>
[not found] ` <CAAdUY-Kx+AjHDEoYVzfERFWFRMArrCMvqY3TTB1vndsQAUxwnA@mail.gmail.com>
[not found] ` <CAAdUY-LyCBThR5PJFPuPf-mNbgFvn5NWGnKgeeh7QVXViaFqTg@mail.gmail.com>
2015-02-09 23:36 ` The ChangeLog and merge conflicts Artur Malabarba
2015-02-10 0:05 ` David Kastrup
2015-02-10 0:17 ` Rüdiger Sonderfeld
2015-02-10 3:43 ` Eli Zaretskii [this message]
2015-02-10 6:55 ` Artur Malabarba
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=83lhk68m8j.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=bruce.connor.am@gmail.com \
--cc=dak@gnu.org \
--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 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.