From: Richard Hartmann Date: Fri, 17 Oct 2008 07:25:06 GMT Subject: Re: commiting while the current version is in conflict Message-ID: <2d460de70810170025y74fbd846nefc7dad24f669e75@mail.gmail.com> In-Reply-To: On Fri, Oct 17, 2008 at 01:42, Jakub Narebski wrote: > [a lot of detailed information] Thanks! 'Unfortunately', I figured all this out by myself, in the meantime, but I really appreciate that you took the time to explain all this . Thanks! Richard PS: Well, I lie, I did not figure out the mv $1.sample $1 bit as my git version still uses the old format.