From: David Kastrup <dak@gnu.org>
To: Artur Malabarba <bruce.connor.am@gmail.com>
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: Re: The ChangeLog and merge conflicts
Date: Tue, 10 Feb 2015 01:05:30 +0100 [thread overview]
Message-ID: <871tlytyut.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <CAAdUY-L5xss_Zjpo34r3Mwu67SpcsENSfjEs+pBfPVkTwJw0vg@mail.gmail.com> (Artur Malabarba's message of "Mon, 9 Feb 2015 23:36:44 +0000")
Artur Malabarba <bruce.connor.am@gmail.com> writes:
> For this short period of time that I've been trying to help here, there is
> one workflow issue that's really been bugging me: the ChangeLog file causes
> conflicts on every merge.
>
> This pops up in two situations:
>
> 1. I do some work on another branch for a couple of days, while adding a
> ChangeLog entry with each commit. I proceed to merge with master.
>
> 2. Someone submits a patch and is kind enough to include a ChangeLog entry
> in it. As usual, the patch is only applied after (in the very least) a few
> days.
>
> If anything at all has happened between branch/patch creation and the
> merge, a conflict is guaranteed to happen.
> Of course, the reason for this is that every new entry goes at the top of
> the ChangeLog, and every commit is accompanied with an entry.
>
> I'm just wondering whether there's a solution around this that I'm not
> aware of. Is there something I should do differently?
>
> These conflicts aren't complicated at all to solve, but it gets irritating
> to have to fix them every single time.
Take a look for the git-merge-changelog program (the respective Debian
package is called just that).
It's still sort of a nuisance to maintain the corresponding entry in the
top level .gitattributes file (since it is itself under version
control), but at least this works reasonably well for the non-toplevel
ChangeLog file merges.
--
David Kastrup
next prev parent reply other threads:[~2015-02-10 0:05 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 [this message]
2015-02-10 0:17 ` Rüdiger Sonderfeld
2015-02-10 3:43 ` Eli Zaretskii
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=871tlytyut.fsf@fencepost.gnu.org \
--to=dak@gnu.org \
--cc=bruce.connor.am@gmail.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 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.