From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: merge renamed files/directories? Date: Tue, 6 May 2008 09:39:01 -0700 (PDT) Message-ID: References: <4819CF50.2020509@tikalk.com> <481D52CC.1030503@tikalk.com> <32541b130805050940x1297e907ofc67ee65494897eb@mail.gmail.com> <200805052349.35867.robin.rosenberg.lists@dewire.com> <20080506154709.GF6918@mit.edu> <48208817.4060005@tikalk.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Theodore Tso , Steven Grimm , Robin Rosenberg , Avery Pennarun , git@vger.kernel.org To: Ittay Dror X-From: git-owner@vger.kernel.org Tue May 06 18:40:51 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JtQDi-0000RS-2H for gcvg-git-2@gmane.org; Tue, 06 May 2008 18:40:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758492AbYEFQkA (ORCPT ); Tue, 6 May 2008 12:40:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759259AbYEFQkA (ORCPT ); Tue, 6 May 2008 12:40:00 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:50492 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752626AbYEFQj7 (ORCPT ); Tue, 6 May 2008 12:39:59 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id m46Gd3vq021846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 May 2008 09:39:04 -0700 Received: from localhost (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id m46Gd1O9016584; Tue, 6 May 2008 09:39:02 -0700 In-Reply-To: <48208817.4060005@tikalk.com> User-Agent: Alpine 1.10 (LFD 962 2008-03-14) X-Spam-Status: No, hits=-3.42 required=5 tests=AWL,BAYES_00 X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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