title: Git non-fast-forward rejected
body: <p>I feel like this question has been asked many times, but the solution is typically "I deleted the directory and re-did my work with a fresh checkout." I did a commit and push but realized that I referred to the wrong ticket number in the commit message. So I looked on SO for a quick <a href="https://stackoverflow.com/questions/179123/how-do-i-edit-an-incorrect-commit-message-in-git">solution</a> and ended up typing the following into the terminal:</p>
  
  <pre><code>$ git reset --soft HEAD^
  $ git commit -m "... correct message ..."
  </code></pre>
  
  <p>The only problem is I am getting the following error message:</p>
  
  <pre><code>To prevent you from losing history, non-fast-forward updates were rejected
  Merge the remote changes before pushing again.  See the 'Note about
  fast-forwards' section of 'git push --help' for details.
  </code></pre>
  
  <p>I am using the git-flow model and am working on the develop branch. How can I merge things back in to make git happy again?</p>