From mboxrd@z Thu Jan 1 00:00:00 1970 From: funeeldy Subject: Re: [PATCH] git-submodule: Remove duplicate entries during merge with conflict Date: Thu, 14 Jul 2011 11:33:39 -0700 (PDT) Message-ID: <1310668419989-6584432.post@n2.nabble.com> References: <4D81C1AA.5010008@morey-chaisemartin.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Jul 14 20:33:47 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 1QhQjK-00088T-7q for gcvg-git-2@lo.gmane.org; Thu, 14 Jul 2011 20:33:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755513Ab1GNSdl (ORCPT ); Thu, 14 Jul 2011 14:33:41 -0400 Received: from sam.nabble.com ([216.139.236.26]:42253 "EHLO sam.nabble.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755383Ab1GNSdk (ORCPT ); Thu, 14 Jul 2011 14:33:40 -0400 Received: from jim.nabble.com ([192.168.236.80]) by sam.nabble.com with esmtp (Exim 4.72) (envelope-from ) id 1QhQjD-0001wF-WA for git@vger.kernel.org; Thu, 14 Jul 2011 11:33:39 -0700 In-Reply-To: <4D81C1AA.5010008@morey-chaisemartin.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: How can new users of git submodules learn about merge conflicts? When and why they occur, and how to resolve them in a way that doesn't lose commits? If I have to choose my version or their version, that isn't really a merge, or is it? Thanks. -- View this message in context: http://git.661346.n2.nabble.com/PATCH-git-submodule-Remove-duplicate-entries-during-merge-with-conflict-tp6180061p6584432.html Sent from the git mailing list archive at Nabble.com.