Eclipse Community Forums: EGit / JGit » branch.master.merge key for pull

Home » Eclipse Projects » EGit / JGit » branch.master.merge key for pull

branch.master.merge key for pull [message #666405]

Wed, 20 April 2011 06:55

Eclipse User

Hi all,

I always have the following error message when I try to pull master branch from origin:
"no values for key branch.master.merge" found in configuration".

Indeed I don't have that key in my git configuration but I don't know how to configure it. Besides, I noticed that none of my colleagues have the problem though they don't have that key either.

Does anyone know what the problem is?

Best regards,
Max

Re: branch.master.merge key for pull [message #666407 is a reply to message #666405]

Wed, 20 April 2011 07:09

Eclipse User

The problem is simple: EGit doesn't know, from which remote branch you want to pull.
If you create your local branch based on a remote tracking branch, then that key is generated automatically.
Otherwise you can create it yourself:
branch.master.merge=refs/heads/master
branch.master.remote=origin

master stands for the branchname, in the key it's your local branch, in the value it's the branch in the remote repository. Place that in the repository-specific configuration file (%repositorypath%\.git\config)

Re: branch.master.merge key for pull [message #666577 is a reply to message #666407]

Thu, 21 April 2011 02:54

Eclipse User

That works, thanks.
That's easy to solve.

It's probably possible to improve usability by adding some explanations like "add the branch.master.merge entry in the repository config file" or something like that. With an example, it's even better. (just a suggestion, of course)

Re: branch.master.merge key for pull [message #666601 is a reply to message #666405]

Thu, 21 April 2011 05:33

Eclipse User

Can you file that as a bug in buzilla?

Re: branch.master.merge key for pull [message #666686 is a reply to message #666577]

Thu, 21 April 2011 11:33

Eclipse User

Please file a bug Smile

https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit& ;rep_platform=All&op_sys=All

Re: branch.master.merge key for pull [message #666758 is a reply to message #666686]

Fri, 22 April 2011 04:12

Eclipse User

Bug 343638 has been added to the database Smile

Re: branch.master.merge key for pull [message #683377 is a reply to message #666405]

Mon, 13 June 2011 12:14

Eclipse User

I'm a GIT & eGit newbie.

Can someone tell me how to create the branch myself using Manuel's suggestion:
branch.master.merge=refs/heads/master
branch.master.remote=origin

Where do I put this info within eclipse? Since I'm newbie, please don't be too technical.

Re: branch.master.merge key for pull [message #819047 is a reply to message #683377]

Mon, 12 March 2012 08:25

Eclipse User

mr_nice_1973 wrote on Mon, 13 June 2011 12:14

Where do I put this info within eclipse? Since I'm newbie, please don't be too technical.

You can do from "Git Repository" perspective → right click on the project → "Open properties view" → press "Edit" button on toolbar on this view → now you can add new entries.

Re: branch.master.merge key for pull [message #819660 is a reply to message #819047]

Tue, 13 March 2012 03:07

Eclipse User

The easiest way to achieve this is to click "Create Branch" in the repositories view
on the remote tracking branch you want to pull from, then this configuration is created
by EGit automatically.

Previous Topic:	Push from JGit->JGit "push not permitted"
Next Topic:	EGit pull results in NPE

Goto Forum:

-=] Back to Top [=-

Current Time: Sun Jun 15 15:43:38 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter