title: Why did the behaviour of git pull change in relation to working copy changes?
body: <p>I want to pull changes into my working copy but git won't let me, I get the same error as <a href="https://stackoverflow.com/questions/21358872/git-cannot-rebase-because-of-uncommitted-changes">this question</a>:</p>
  
  <pre><code>Cannot rebase: Your index contains uncommitted changes.
  Please commit or stash them.
  </code></pre>
  
  <p>I know that I can commit and then merge, or stash - then pull - then apply the stash, but previously a pull would merge changes into my working copy preserving my local changes. It was seamless, any conflicts would be marked up for me to resolve in my working copy, just like when merging committed changes. I found this very convenient, why has this behaviour changed? And how can I make git behave like that again?</p>