title: Heroku: how to "git pull" after 'git push -f'
body: <p>I got this error message (copied below) after trying to push to Heroku. I initially set up a facebook canvas app and selected the hosting on heroku options. It gave me a heroku url, which I added as a remote on the app I was developing on my machine</p>
  
  <pre><code>heroku git:remote -a desolate-springs-1684
  </code></pre>
  
  <p>But when I pushed, I got this error</p>
  
  <pre><code>error: failed to push some refs to 'git@heroku.com:desolate-springs-1684.git'
  To prevent you from losing history, non-fast-forward updates were rejected
  Merge the remote changes (e.g. 'git pull') before pushing again.  See the
  'Note about fast-forwards' section of 'git push --help' for details.
  localhost:nhl michaelmitchell$ 
  </code></pre>
  
  <p>So I did </p>
  
  <pre><code>git push -f heroku master
  </code></pre>
  
  <p>But now I apparently have to do a 'git pull'. However, what do i put after the 'git pull'? The name of the heroku url? or something else? </p>