Question

I have a pretty big problem. I am going through a Ruby on Rails tutorial, and they have suggested that I use GIT for version control. I have never used it before, and through the tutorial I don’t think I used it right. Here is some back story.

I created a new project, and then I created a new Github repository. I named them the same thing, and I pushed my project to that repository. I then looked at Github, and all of my project files were there. I then went through a few chapters of the tutorial, and followed there instructions for pushing files to GIT. After awhile I realized, that none of my files were being uploaded. I didn’t really care, so I went on with the tutorial. Still pushing files to GIT even though they were not showing up.

IMPORTANT
My Github repository only had the few files from when I first created it, the project on my local machine has a MANY more files. In the last chapter of the tutorial I was able to follow, it told me to do these commands:

$ git add .
$ git commit -m "Finish layout and routes"
$ git checkout master
$ git merge filling-in-layout

Once I did those commands, my project located on my local machine lost ALL of the files I created in the last couple of days. My guess is that Github replaced my files from my local machine with the files on Github (Just the files created when I started the project)

I think I have been adding files to GIT on my local machine since the folder ‘~/.git/logs/HEAD’ has all of the commits I made, with what looks like GIT file numbers.

Any help would save me so many hours.
Thanks, -Chris

Answer 1

You committed some changes, then got the old version and reverted to it by issuing “git merge filling-in-layout”. (you created a branch “filling-in-layout”)

whatever you do DO NOT -> git reset --hard <- DO NOT.

what does “git branch” say?

do this:

git checkout master (or one of the others)

and look which one is yours. 😉