From: Linus Torvalds Date: Tue, 06 May 2008 16:39:01 GMT Subject: Re: merge renamed files/directories? Message-ID: In-Reply-To: <48208817.4060005@tikalk.com> On Tue, 6 May 2008, Ittay Dror wrote: > > And no, it's not a common problem, but I don't like the fact that a merge > conflict happens and the SCM doesn't tell me about it. I do agree that the most irritating feature of it is the silent clean merge. When it's not obvious what the right thing to do is, generally a merge strategy should try to warn, or even generate a conflict. That said, anybody who thinks that "merge was automatic and successful" means that the mege was _correct_ is sadly mistaken. So you really shouldn't depend on it, and yeah, I strongly suggest building and testing after a merge (and before you push the result out), so that you can fix any issues. Linus