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?