From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: Re: [PATCH v2] Teach merge the '[-e|--edit]' option Date: Mon, 10 Oct 2011 09:50:25 +0200 Message-ID: References: <7vk48gwvyd.fsf@alter.siamese.dyndns.org> <1318023997-54810-1-git-send-email-jaysoffian@gmail.com> <7vfwj4tplw.fsf@alter.siamese.dyndns.org> <7v8votpx4n.fsf@alter.siamese.dyndns.org> <7vr52lo1m3.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain Cc: Junio C Hamano , git@vger.kernel.org, Jay Soffian , Ramkumar Ramachandra To: Jakub Narebski X-From: git-owner@vger.kernel.org Mon Oct 10 09:50:42 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RDAdD-0000nZ-AE for gcvg-git-2@lo.gmane.org; Mon, 10 Oct 2011 09:50:39 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752307Ab1JJHue (ORCPT ); Mon, 10 Oct 2011 03:50:34 -0400 Received: from mx1.imag.fr ([129.88.30.5]:39075 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751027Ab1JJHue (ORCPT ); Mon, 10 Oct 2011 03:50:34 -0400 Received: from mail-veri.imag.fr (mail-veri.imag.fr [129.88.43.52]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id p9A7lmmQ018782 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Mon, 10 Oct 2011 09:47:48 +0200 Received: from bauges.imag.fr ([129.88.7.32]) by mail-veri.imag.fr with esmtp (Exim 4.69) (envelope-from ) id 1RDAd0-0006IE-77; Mon, 10 Oct 2011 09:50:26 +0200 In-Reply-To: (Jakub Narebski's message of "Mon, 10 Oct 2011 00:05:02 -0700 (PDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Mon, 10 Oct 2011 09:47:48 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: p9A7lmmQ018782 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: matthieu.moy@grenoble-inp.fr MailScanner-NULL-Check: 1318837671.98701@03q1n98+aU9cpDl3b9T04Q Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Jakub Narebski writes: > Yet another issue is if we should blindly trust automatic merge resolution. > It is considered a good practice by some to always check (e.g. by compiling > and possibly also running tests) the result of merge, whether it required > merge conflict resolution or not. I agree that trusting merge blindly is bad, but still, if there are no merge conflicts, and if the merge is broken, I'd prefer commiting a fixup patch right after the merge than fixing it before committing. Because if the merge needs a fix, it usually means something tricky that deserves its own patch and commit message. At worse, one can still reset --merge HEAD^. One other issue with not committing automatically is for beginners. I see that all the time when the merge has conflicts. newbies fix the conflicts, and when they're done: "fine, conflicts solved, let's continue hacking" without committing. The resulting history is totally messy because it mixes merges and actual edits. For these users, not committing automatically in the absence of conflict would make the situation even worse. -- Matthieu Moy http://www-verimag.imag.fr/~moy/