Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Git: 'Master cannot be resolved to branch' after merge

Every time I merge a branch back into my master branch, I can no longer push to origin. I get the message fatal: master cannot be resolved to branch

I made a simple test change:

  • Created a new branch git branch TestBranch
  • Made a change to TestBranch and commited
  • Checked out back to master git checkout Master
  • Merged TestBranch git merge TestBranch

The merge seems to have gone fine, but now when I use Git status the Master branch does not tell me that it is ahead of the origin. And when I try to push to origin Master I get the message above.

Does anybody know what is causing this problem?

like image 278
Chris Avatar asked Aug 08 '12 08:08

Chris


People also ask

What is refs head git?

git/refs/ . In Git, a head is a ref that points to the tip (latest commit) of a branch. You can view your repository's heads in the path . git/refs/heads/ . In this path you will find one file for each branch, and the content in each file will be the commit ID of the tip (most recent commit) of that branch.


1 Answers

Could it be that you write Master instead of master? If the system is case sensitive they wouldn't match, and lower-case master is the default in most repositories.

like image 61
Eivind Eidheim Elseth Avatar answered Nov 14 '22 05:11

Eivind Eidheim Elseth