Ruby on Rails

1) Go to project folder 2) Terminal run on   command  'git init' 3)git add. or git add * 4)Run the command  git commit -m "first commit" 5) git remote add origin https://github.com/ username /Hello-World.git 6)Type your username and password. 7)git pull origin master 8)git push origin master. 9)conflict errors in github    i)Rename the file.    ii)Again git pull command    iii)difference beteween file.rb file1.rb      xxdiff file.rb file1.rb 10)git pull 11)git push origin master