I\'m having a git problem where I want to merge a branch into master but it\'s refusing to merge because it thinks I have local changes to a file. Doing status shows no changes
