Howard Halim

~~I think this edge case is rare enough that a breaking change isn't justified~~ (edit: I no longer think this, see comment below) But, if you _are_ planning to change...

I changed my mind after running into this issue myself (with a file named `c`), and I've updated my earlier comment to reflect that. I wouldn't mind introducing a breaking...

It sounds like you have uncommitted changes in your local branch. You should commit them first before running `git merge upstream/master`