git pull failed

git pull failed

[Han Pingtian]

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)
Auto-merging Doc/Zsh/prompt.yo
Auto-merging ChangeLog
CONFLICT (content): Merge conflict in ChangeLog
Automatic merge failed; fix conflicts and then commit the result.

And this is the head of ChangeLog:

<<<<<<< HEAD
2015-03-05  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
=======
2015-04-07  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>

        * 34850: Doc/zman.yo, Doc/ztexi.yo, Doc/META-FAQ.yo,
        Doc/Zsh/contrib.yo, Doc/Zsh/ftp_sites.yo, Doc/Zsh/manual.yo,
        Doc/Zsh/metafaq.yo, Doc/Zsh/roadmap.yo: make URLs in html/pdf
        docs clickable

2015-04-06  Barton E. Schaefer  <schaefer@zsh.org>

        * 34851: Src/builtin.c: fix thinko from 34093 that short-circuited
        some "whence -m" searches

2015-04-03  Barton E. Schaefer  <schaefer@zsh.org>

        * 34837: Src/glob.c: avoid loss of original file path when applying
        colon-modifiers in glob qualifiers, that path is still needed for
        later stat() when sorting.

2015-04-03  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>

        * 34840: Doc/Zsh/prompt.yo: minor format fixes

2015-04-02  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
>>>>>>> be5f561fa4cfd2f9c705fc24bdbc096070586a74

What shall I do for pulling master?

Re: git pull failed

[Mikael Magnusson]

On Thu, Apr 9, 2015 at 9:02 AM, Han Pingtian <hanpt@linux.vnet.ibm.com> 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

Re: git pull failed

[Jun T.]

2015/04/09 16:51, Mikael Magnusson <mikachu@gmail.com> wrote:
> 
> I guess someone did a push -f

Sorry, I apologize for any inconvenience.

Re: git pull failed

[Han Pingtian]

On Thu, Apr 09, 2015 at 09:51:49AM +0200, Mikael Magnusson wrote:
> 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).
Thanks! It works just fine.