From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Tue, 12 Aug 2008 17:55:16 GMT
Subject: Re: TOPGIT: [PATCH] tg create: add --force option to resolve merge dependencies.
Message-ID: <36ca99e90808121055v5efcc1do68731b905a359a68@mail.gmail.com>
In-Reply-To: <1218553338.7264.14.camel@heerbeest>

On Tue, Aug 12, 2008 at 17:02, Jan Nieuwenhuizen <janneke-list@xs4all.nl> wrote:
> 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.
Could be, there was a fix for this from me. If you have a
.git/info/gitattributes file, you where hit by the bug. But with 0.2
this is gone.

Bert
>
> Thanks.