I'm using xcode 15.1 with git version control and was happily committing and pushing branches and merging them back into main. Until a couple of days ago, when every attempt to merge started being met with a 'you have uncommitted changes' message, and the files above being named.
Sometimes I can commit the 'changes' and merge but sometime I'm asked to compare changes in files I cant even read in xcode and I cant proceed.