Question

One day I couldn’t remember where my main working directory for my folder was, so I just decided to clone the project from the “[e-mail]:” address that’s on the github web page.

I didn’t know what I was doing that day, and I created a bunch of stuff after that in the directory. Then I did git add, git clone, and git push, (I forget how). But now I have this branch called ‘gh-pages’ on the github site. I really wish I didn’t have that branch, but I do.

Today I found my original directory and I created some stuff in it today, and did some ‘add’ and some ‘push’. It went to the master ‘branch’ (which I expected, because I kinda gave up hope on the other weird branch). But my problem is now this:

When my users (I tried this on another machine myself) do a git clone by using the address that github gives me on the main page of my project), they for some weird reason end up with the code from the ‘gh-pages’ branch.

Q1: How do I have them do a git clone so that they can get the stuff that I worked on today (which is in the master branch).
Q2: how do I remove the ‘gh-pages’ branch from the github site? I decided to abandon it. If you have a better suggestion, I’m receptive to that too.
Q3: Bonus points if you can tell me what I should have done earlier on, once I realized I have two places on my pc that has code for two separate branches in my project on github.

Answer 1

Q1: git clone http://remote.url/repo.git -b master
Q2: git push origin :gh-pages, assuming origin is the remote you want to work on.

BTW, git comes with pretty good documentation. It can be accessed with

$ git help command

e.g.

$ git help clone