Linus Torvalds <torvalds@osdl.org> writes: > On Sun, 8 Oct 2006, Junio C Hamano wrote: >> >> Note note note. The above patch alone leaves merge risky to >> remove an untracked working tree files, and needs to be >> compensated by corresponding checks to the git-merge-xxx >> strategies. The original code was overcautious, but was >> protecting valid cases too. > > I think the difference _should_ be that we only remove the local file if > it was removed _remotely_. >... > Agreed? I reviewed the patch I sent out, the one after the one you responded to, and I think it (which is the one I have in "pu") is in line with the reasoning you outlined in your message. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Tue Oct 10 16:32:39 2006
This archive was generated by hypermail 2.1.8 : 2006-10-10 16:33:29 EST