Most of the online solutions are under the command line. I use egit, so I need to add the following sentence to the configuration file in eclipse (my version is Kepler.
Window-> preference-> Team-> Git-> Configuration-> repository settings-> select your repository and click Open
[Branch "master"]
Remote = Origin
Merge = refs/heads/Master
Second
1. Find the config file in the local project directory (my files are in E: \ rocket \. Git); 2. Modify the config file to [core].
Repositoryformatversion = 0
Filemode = false
Logallrefupdates = true
[Branch "master"]
Remote = Origin
Merge = refs/heads/Master
[Remote "Origin"]
Url = https://github.com/androidzhaoxiaogang/rocket.git (modify to your own URL)
Fetch = + refs/heads/*: refs/remotes/ORIGIN/* 3. Run the pull method again and find that the job is OK.
Solve the current branch is not configured for pull no value for key branch. master. Merge found in config