From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: TOPGIT: [PATCH] tg create: add --force option to resolve merge dependencies. Date: Tue, 12 Aug 2008 17:02:18 +0200 Organization: lilypond-design.org Message-ID: <1218553338.7264.14.camel@heerbeest> References: <1218546106.7264.11.camel@heerbeest> <20080812133857.GL32184@machine.or.cz> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org To: Petr Baudis X-From: git-owner@vger.kernel.org Tue Aug 12 17:03:27 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 1KSvPB-0004xb-4c for gcvg-git-2@gmane.org; Tue, 12 Aug 2008 17:03:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752656AbYHLPCW (ORCPT ); Tue, 12 Aug 2008 11:02:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752566AbYHLPCV (ORCPT ); Tue, 12 Aug 2008 11:02:21 -0400 Received: from edu-smtp-02.edutel.nl ([88.159.1.222]:40662 "EHLO edu-smtp-02.edutel.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbYHLPCV (ORCPT ); Tue, 12 Aug 2008 11:02:21 -0400 Received: from heerbeest (unknown [88.159.206.46]) by edu-smtp-02.edutel.nl (Postfix) with ESMTP id F1DA211E714; Tue, 12 Aug 2008 17:02:19 +0200 (CEST) Received: from [127.0.0.1] (localhost [127.0.0.1]) by heerbeest (Postfix) with ESMTP id 32F40DC07A; Tue, 12 Aug 2008 17:02:19 +0200 (CEST) In-Reply-To: <20080812133857.GL32184@machine.or.cz> X-Mailer: Evolution 2.23.6 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On di, 2008-08-12 at 15:38 +0200, Petr Baudis wrote: > how exactly did you get the morge conflicts? I'm not sure, cannot seem to reproduce them anymore. May have been pre-0.2 issue or another goof-up over here. Thanks. -- Jan Nieuwenhuizen | GNU LilyPond - The music typesetter http://www.xs4all.nl/~jantien | http://www.lilypond.org