Re: [PATCH 0/3] detecting delete/modechange conflicts

On Mon, Oct 26, 2015 at 02:46:42PM -0700, Junio C Hamano wrote: > > After looking through the history and the list archive, I don't _think_ > > this was intentional, and we simply missed the case in both places. But > > maybe somebody else knows something I don't. It seems like we should be > >

[PATCH 0/3] detecting delete/modechange conflicts

I was surprised to find that: # base commit echo base >file && git add file && git commit -m base && # one side changes mode chmod +x file && git commit -am executable && # the other deletes the file git checkout -b other HEAD^ && git rm file && git commit -am removed &&

Re: [PATCH 0/3] detecting delete/modechange conflicts

Jeff King writes: > After looking through the history and the list archive, I don't _think_ > this was intentional, and we simply missed the case in both places. But > maybe somebody else knows something I don't. It seems like we should be > punting to the user under the general