From: Glenn Morris <rgm@gnu.org>
To: 29366@debbugs.gnu.org
Cc: monnier@iro.umontreal.ca, deng@randomsample.de
Subject: bug#29366: gitmerge to handle NEWS better
Date: Mon, 20 Nov 2017 13:16:41 -0500 [thread overview]
Message-ID: <a9wp2k24ty.fsf@fencepost.gnu.org> (raw)
Package: emacs
Version: 25.3
Severity: wishlist
Hi,
Thanks for gitmerge.el, it's a great help.
It would be nice if it could handle NEWS better.
Currently etc/NEWS in the emacs-26 branch has been renamed to
etc/NEWS.26 in master. Running M-x gitmerge, this is not detected.
emacs-26:etc/NEWS changes are merged to master:etc/NEWS, resulting in a
merge conflict every time NEWS is touched in emacs-26.
Can gitmerge do something to help here?
next reply other threads:[~2017-11-20 18:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 18:16 Glenn Morris [this message]
2017-12-11 19:11 ` bug#29366: gitmerge to handle NEWS better Glenn Morris
2017-12-11 23:18 ` David Engster
2017-12-11 23:33 ` Glenn Morris
2017-12-12 20:10 ` David Engster
2017-12-13 3:06 ` Glenn Morris
2018-10-23 17:10 ` Glenn Morris
2018-10-23 17:23 ` Eli Zaretskii
2018-10-23 17:35 ` Eli Zaretskii
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=a9wp2k24ty.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=29366@debbugs.gnu.org \
--cc=deng@randomsample.de \
--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 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).