From: Petr Baudis Date: Fri, 25 Nov 2005 22:48:57 GMT Subject: Re: files are disappearing in git Message-ID: <20051125224857.GA10680@pasky.or.cz> In-Reply-To: Dear diary, on Fri, Nov 25, 2005 at 11:11:22PM CET, I got a letter where Linus Torvalds said that... > For example, let's say that you had a dirty tree or something, and then > the merge failed, and you didn't see anything wrong, so you just end up > doing a "git commit". At _that_ point, what you had in the index matters > very much, of course, since the index is what will be committed. > > > I think that's the situation where I've personally managed to lose > > and/or revert some changes. > > Hmm.. Can you elaborate? > > (Side note: all my commentary is purely about the "raw git" interfaces. I > don't know what cogito may do on top of it). Note that Cogito is now (v0.15.1 or later) supposed to handle merges on top of trees with local changes fine - it will either error out, or in case the merge is done on unrelated files it will temporarily ignore your local changes and cg-commit won't mix them up (even if you do some conflict fixups). -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.