title: How to update local repo with master?
body: <p>I am used to using SVN and only recently switched to GitHub.  </p>
  
  <p>I am trying to update some files in a GitHub repo, but I get this message:</p>
  
  <pre><code>To https://github.com/.../
   ! [rejected]        master -&gt; master (non-fast-forward)
  error: failed to push some refs to 'https://github.com/.../'
  hint: Updates were rejected because the tip of your current branch is behind
  hint: its remote counterpart. Integrate the remote changes (e.g.
  hint: 'git pull ...') before pushing again.
  hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  </code></pre>
  
  <p>I have tried commands like <code>git fetch origin</code> and <code>git pull</code>, but none of these make it so my current branch is not behind. </p>
  
  <p>In SVN I'd just do <code>svn update</code> and then commit my changes.  </p>
  
  <p>I've also tried <code>git pull origin</code>, but I get a strange text message popping up and I have no idea how to interface with it: <a href="https://stackoverflow.com/questions/1443210/updating-a-local-repository-with-changes-from-a-github-repository">Updating a local repository with changes from a Github repository</a></p>