From: Aghiles <aghilesk@gmail.com>
Date: Thu, 08 Apr 2010 19:55:23 GMT
Subject: Re: git pull with "no common commits" : danger?
Message-ID: <t2j3abd05a91004081255h58d2aca3leeb41adf53dc6a4f@mail.gmail.com>
In-Reply-To: <20100408054349.GA6067@progeny.tock>

Jonathan Nieder <jrnieder@gmail.com> writes:
>
> ...
>
> On the other hand, ‘git pull’ is a little different.  The fetch has
> very little cost because it’s interruptible, but the merge could
> result in two unrelated pieces of history being merged, requiring
> the user to use ‘git reset --keep HEAD^’ to get back to the
> previous state.  A more likely outcome is a merge conflict, requiring
> ‘git reset --merge’ to recover.
>
> Can we make this less painful?  Is it worth adding yet another option
> to ‘git pull’ to avoid this pain?  I don’t know.

That is exactly the case I was talking about.  I never lost any data
because of this and considering what Junio Hamano is saying I
probably should just continue to do the 'git reset'.

  -- aghiles