Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: git pull failed

On Thu, Apr 9, 2015 at 9:02 AM, Han Pingtian <hanpt@xxxxxxxxxxxxxxxxxx> wrote:
> Hi,
>
> Today git pull failed with those message:
>
> % git pull
> remote: Counting objects: 51, done.
> remote: Compressing objects: 100% (35/35), done.
> remote: Total 35 (delta 30), reused 0 (delta 0)
> Unpacking objects: 100% (35/35), done.
> From git://git.code.sf.net/p/zsh/code
>  + ca946b6...be5f561 master     -> origin/master  (forced update)
[...]
> What shall I do for pulling master?

I guess someone did a push -f, which they definitely should not be
doing on a public repo. You were unlucky and pulled the commit that
was since deleted. You can get back to a normal state by issuing
git reset --hard origin/master
(this will delete any committed or uncommited changes you have on the
local master branch).

-- 
Mikael Magnusson
Messages sorted by: Reverse Date, Date, Thread, Author