From: Jan Nieuwenhuizen Date: Tue, 12 Aug 2008 15:02:18 GMT Subject: Re: TOPGIT: [PATCH] tg create: add --force option to resolve merge dependencies. Message-ID: <1218553338.7264.14.camel@heerbeest> In-Reply-To: <20080812133857.GL32184@machine.or.cz> 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