From: Paul Eggert <eggert@cs.ucla.edu>
To: Glenn Morris <rgm@gnu.org>, emacs-devel@gnu.org
Subject: Re: master bcf244e 9/9: Merge from origin/emacs-25
Date: Sun, 1 Jan 2017 20:39:42 -0800 [thread overview]
Message-ID: <62f2eef7-77bf-eb74-75ff-4862e98f55bb@cs.ucla.edu> (raw)
In-Reply-To: <j0shp2cp5n.fsf@fencepost.gnu.org>
Glenn Morris wrote:
> In this case it seems to have resurrected several files that had been
> deleted on master:
Thanks, I deleted those files from master.
> (Can't git perform better than this?)
It is a bit tricky in general when one branch deletes a file and another branch
changes it. I think git merge uses the changed file in that case, under the
theory that this is more often better than deleting the file.
Presumably gitmerge could be taught about this situation.
prev parent reply other threads:[~2017-01-02 4:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170101091842.9320.638@vcs.savannah.gnu.org>
[not found] ` <20170101091856.14F2B220152@vcs.savannah.gnu.org>
2017-01-01 23:54 ` master bcf244e 9/9: Merge from origin/emacs-25 Glenn Morris
2017-01-02 4:39 ` Paul Eggert [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=62f2eef7-77bf-eb74-75ff-4862e98f55bb@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=rgm@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).