Changing filename case causes inability to merge branch on OSX

Hi,

I am struggling with changing the case of a filename on OSX:

http://stackoverflow.com/questions/34799472/how-to-correctly-change-filename-case-in-git-on-osx

I found this thread which seems related, but don't seem to see any resolution:

http://thread.gmane.org/gmane.comp.version-control.git/188469

Let me know if there is any additional information that I can provide or if there is a known way to change the case of the filename without breaking the ability to merge branches that contain that change.

Thanks, Tyler