From: Jacob Helwig <jacob.helwig@gmail.com>
Date: Mon, 09 Nov 2009 16:21:28 GMT
Subject: Re: Git drawbacks?
Message-ID: <8c9a060911090821h678ace9bg978c185bda94e3f4@mail.gmail.com>
In-Reply-To: <loom.20091109T165620-587@post.gmane.org>

On Mon, Nov 9, 2009 at 07:59, Dmitry Smirnov <divis1969@gmail.com> wrote:
> Jacob Helwig <jacob.helwig <at> gmail.com> writes:
>
>> It does have a few caveats, however.  If you have the same branch
>> checked out in two different working copies created using
>>...
>> place on your machine, you'll never notice, thuogh.
>
>
> So, i cannot recover from this situation by upmerging to the new head?
>

If you haven't actually made any changes in the second checkout of the
branch, then recovery is a simple reset --hard.  If you have made any
changes in that working copy, then recovery is a bit more complicated,
and it's probably best if I leave that explanation up to someone else,
since I'm very careful to avoid this situation in the first place, and
have never actually had to recover from it.