From: Aneesh Kumar <aneesh.kumar@gmail.com>
Date: Sat, 28 Apr 2007 17:37:53 GMT
Subject: git pull origin fails
Message-ID: <cc723f590704281037v5d2142d7u2edf7e503cb3ce19@mail.gmail.com>

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