[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master bcf244e 9/9: Merge from origin/emacs-25
|
From: |
Paul Eggert |
|
Subject: |
Re: master bcf244e 9/9: Merge from origin/emacs-25 |
|
Date: |
Sun, 1 Jan 2017 20:39:42 -0800 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 |
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.