git pull origin fails

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]