From: Petr Baudis Date: Mon, 12 Sep 2005 00:58:07 GMT Subject: Re: bogus merges Message-ID: <20050912005807.GI15630@pasky.or.cz> In-Reply-To: Dear diary, on Sun, Sep 11, 2005 at 08:08:14PM CEST, I got a letter where Daniel Barkalow told me that... > I think that the fundamental bug is that tree_timewrap() doesn't clear > .git/merging, which means that it can still think you're doing a merge > when you've started doing something else (such as doing further > development after updating to someone else's merge of your tree). Oh, nice catch. Thanks, fixed. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ If you want the holes in your knowledge showing up try teaching someone. -- Alan Cox