title: How can a new file be owerwritten at a git rebase?
body: <p>So I had been working on a checkout out feature branch, let's call it <code>feature-branch-development</code>. I ended up with a considerable amount of commits on this branch, 15 or so. When it was finally time for me to rebase the <code>master</code> branch into feature-branch-development it stopped midway complaining about a new file that I added on <code>feature-branch-development</code> and gave me an error saying something like <code>Your changes on this branch will be overwritten, please commit or stash them.</code> I had of course already commited everything and my working tree was clean. It was as if git "believed" the new file also existed on master. Noteworthy is also that I had no merge conflicts at this point.</p>
  
  <p>I solved the issue by squashing all my commits on <code>feature-branch-development</code> and rebased <code>master</code> again.</p>
  
  <p>My question therefore is why git acted like this? I have an intermediate knowledge of Git and I'm merely asking this question to level my amount of knowledge. </p>