* Re: master bcf244e 9/9: Merge from origin/emacs-25
[not found] ` <20170101091856.14F2B220152@vcs.savannah.gnu.org>
@ 2017-01-01 23:54 ` Glenn Morris
2017-01-02 4:39 ` Paul Eggert
0 siblings, 1 reply; 2+ messages in thread
From: Glenn Morris @ 2017-01-01 23:54 UTC (permalink / raw)
To: emacs-devel; +Cc: Paul Eggert
Thanks for doing the merging.
In this case it seems to have resurrected several files that had been
deleted on master:
create mode 100644 lisp/gnus/gnus-ems.el
create mode 100644 lisp/gnus/gnus-sync.el
create mode 100644 lisp/gnus/messcompat.el
create mode 100644 lisp/nxml/nxml-glyph.el
create mode 100644 lisp/nxml/nxml-uchnm.el
create mode 100644 lisp/obsolete/awk-mode.el
create mode 100644 lisp/obsolete/iso-acc.el
create mode 100644 lisp/obsolete/iso-insert.el
create mode 100644 lisp/obsolete/iso-swed.el
create mode 100644 lisp/obsolete/resume.el
create mode 100644 lisp/obsolete/scribe.el
create mode 100644 lisp/obsolete/spell.el
create mode 100644 lisp/obsolete/swedish.el
create mode 100644 lisp/obsolete/sym-comp.el
(Can't git perform better than this?)
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: master bcf244e 9/9: Merge from origin/emacs-25
2017-01-01 23:54 ` master bcf244e 9/9: Merge from origin/emacs-25 Glenn Morris
@ 2017-01-02 4:39 ` Paul Eggert
0 siblings, 0 replies; 2+ messages in thread
From: Paul Eggert @ 2017-01-02 4:39 UTC (permalink / raw)
To: Glenn Morris, emacs-devel
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-02 4:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[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
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.