title: Please commit your changes or stash them before you merge
body: <p>I want to upgrade, but I need to commit, but when I do git commit, I get:</p>
  <blockquote>
  <p>Your branch is behind 'origin/develop' by 20 commits, and can be fast-forwarded.</p>
  <p>(use &quot;git pull&quot; to update your local branch)</p>
  </blockquote>
  <p>I don't want to lose my local changes</p>