title: "Updates were rejected" trying to push to Github
body: <p>I know there are similar questions to this, but nothing that has been suggested is working for me, and I'm losing my mind with this!</p>
  
  <p>Quick rundown: Completely new to programming. Started from scratch on learning Rails with a book.</p>
  
  <p>I'm on a mac(osx 10.7.5),I've installed Ruby, Rails, and Git (and the needed command line tools), but git/github is definitely giving me problems.<br>
  I followed what was suggested here: <a href="https://stackoverflow.com/questions/18328800/github-updates-were-rejected-because-the-remote-contains-work-that-you-do-not-h">Github &quot;Updates were rejected because the remote contains work that you do not have&quot;</a>                                                                              </p>
  
  <p>So first I did:</p>
  
  <pre><code>git remote add origin https:/github.com/MY_USER/learn-rails.git
  </code></pre>
  
  <p>and I get:</p>
  
  <pre><code>fatal: remote origin already exists.
  </code></pre>
  
  <p>I then move on to:</p>
  
  <pre><code>git push -u origin master
  </code></pre>
  
  <p>and I keep getting the following error:</p>
  
  <pre><code>![rejected]master -&gt; master (fetch first)
  error: failed to push some refs to 'https://github.com/MY_USER_NAME/learn-rails.git'
  hint: Updates were rejected because the remote contains work that you do
  hint: not have locally. This is usually caused by another repository pushing
  hint: to the same ref. You may want to first integrate the remote changes
  hint: (e.g., 'git pull ...') before pushing again.
  </code></pre>
  
  <p>I go ahead and try:</p>
  
  <pre><code>git pull origin master
  </code></pre>
  
  <p>which gives me this:</p>
  
  <pre><code>From https://github.com/MY_USER/learn-rails
  * branch            master     -&gt; FETCH_HEAD
  Auto-merging config/initializers/secret_token.rb
  CONFLICT (add/add): Merge conflict in config/initializers/secret_token.rb
  Auto-merging config/environments/development.rb
  CONFLICT (add/add): Merge conflict in config/environments/development.rb
  Auto-merging Gemfile.lock
  CONFLICT (add/add): Merge conflict in Gemfile.lock
  Auto-merging Gemfile
  CONFLICT (add/add): Merge conflict in Gemfile
  Auto-merging .gitignore
  CONFLICT (add/add): Merge conflict in .gitignore
  Automatic merge failed; fix conflicts and then commit the result.        
  </code></pre>
  
  <p>Even more background info: This is my second go around with this test/learning project due to having completely different problems pushing to Github previously. I scratched the whole thing and started fresh from chapter one, hoping that I might of just missed something when I was setting up GIt. I was previously have a ver stubborn problem with Github telling me the repository doesn't exist. I tried so many things to try and fix that problem, that I lost track of what I had even tried. So I just wanted to start clean. I deleted the "Learn-Rails" directory on my computer, and recreated it for this go around. I deleted the previous repository from my Github account, and now have started a new one, but it was named the same exact thing before. Would that cause an issue?  </p>