将本地项目文件上传到git后,从git上pull拉取代码时报错:
The current branch is not configured for pull No value for key branch.master.merge found in config
解决办法:
在eclipse找到window-preferences下的git 配置文件;切换到repository settings,选择项目后填写信息如下;
也可直接在项目里找到git的配置文件,直接编辑配置文件:
修改config文件内容为:
[branch "master"]
remote = origin
merge = refs/heads/master
[remote "origin"]
url = https://github.com/androidzhaoxiaogang/rocket.git (修改为自己的url)
fetch = +refs/heads/*:refs/remotes/origin/*
remote = origin
merge = refs/heads/master
[remote "origin"]
url = https://github.com/androidzhaoxiaogang/rocket.git (修改为自己的url)
fetch = +refs/heads/*:refs/remotes/origin/*