解决The current branch is not configured for pull No value for key branch.master.merge found in config

http://blog.csdn.net/androidzhaoxiaogang/article/details/16859099

1.在本地工程目录找到config文件（我的是在E:\rocket\rocket\.git）；

2.修改config文件内容为：

[core]
    repositoryformatversion = 0
    filemode = false
    logallrefupdates = true
    [branch "master"] 
        remote = origin 
        merge = refs/heads/master 
    [remote "origin"] 
        url = https://github.com/androidzhaoxiaogang/rocket.git   （ 修改为自己的url）
        fetch = +refs/heads/*:refs/remotes/origin/*

3.再执行pull方法，发现工作ok了

http://blog.csdn.net/lizhongren/article/details/16338731

网上多半都是命令行下的解决方案,我用的是EGit,所以要在eclipse里(我的版本是kepler)把下面这句话添加到配置文件中.

Window->Preference->Team->Git->Configuration->Repository Settings->选择你的repository,然后点open

[branch "master"]
  remote = origin
  merge = refs/heads/master