git pull origin fails

Aneesh Kumar· Apr 28, 2007, 17:37 UTC · lore

git version 1.5.2.rc0.1.g2cc31-dirty gives me the below error when doing a git pull origin

Warning: No merge candidate found because value of config option
         "branch.master.merge" does not match any remote branch fetched.

I was able to do git fetch origin git merge origin/master

-aneesh

Aneesh Kumar· Apr 28, 2007, 17:49 UTC · re: Aneesh Kumar · lore

Re: git pull origin fails

False alarm. I guess i had some wrong values for remote in  my .git/config file

-aneesh

On 4/28/07, Aneesh Kumar <aneesh.kumar@gmail.com> wrote:

Show 15 quoted lines

> git version 1.5.2.rc0.1.g2cc31-dirty gives me the below error when
> doing a git pull origin
>
>
> Warning: No merge candidate found because value of config option
>          "branch.master.merge" does not match any remote branch fetched.
>
>
> I was able to do
> git fetch origin
> git merge origin/master
>
>
> -aneesh
>