From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755354Ab1KGGcs (ORCPT ); Mon, 7 Nov 2011 01:32:48 -0500 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:62105 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751681Ab1KGGcr (ORCPT ); Mon, 7 Nov 2011 01:32:47 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=OwefmqjbuhyG9tlLyQDLscFLEs+tgxno ltnZ/nR6dzns5ZADSZ6cgXKHLM0dfyeqq5hN5vw2dKGXs5mA3S3h1ajPuvRMhwpt NSIE6abuoTGNRuQ/Iqj+a87zJ6zWnsXSwAg3npBlnbQtRgkwfntxcWVTC4efwiqG j2yxjJFpnO8= From: Junio C Hamano To: Linus Torvalds Cc: Kukjin Kim , linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: EXYNOS4: Fix the merge conflict References: <1320458934-8225-1-git-send-email-kgene.kim@samsung.com> Date: Sun, 06 Nov 2011 22:32:44 -0800 In-Reply-To: (Linus Torvalds's message of "Sat, 5 Nov 2011 09:29:08 -0700") Message-ID: <7v7h3c30j7.fsf@alter.siamese.dyndns.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Pobox-Relay-ID: 4DC15352-090A-11E1-BC15-9DB42E706CDE-77302942!b-pb-sasl-quonix.pobox.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus Torvalds writes: > On Fri, Nov 4, 2011 at 7:08 PM, Kukjin Kim wrote: >> The mark of conflict should be removed. Would the hooks/pre-commit.sample have helped? The "git diff --check" at the last step would have caught this with modern versions of git.