File keeps showing as modified

Question

I have a very strange problem with one file in git.

the file Example.php was already present when I created new branch feature/xyz
I changed the file and committed/pushed to feature/xyz
feature/xyz was merged back into develop
when I checkout develop, Example.php shows as modified
if I try to commit, it says: 1 file failed to commit: git fix On branch develop Your branch is up to date with 'origin/develop'. Changes not staged for commit: Example.php
if I revert, the file reverts to the status it had before my push in feature/xyz, but shows as modified directly after
if I revert again then, it shows what it's like in develop now (which it should) but then turns to modified immediately again

Things I tried:

changing the file and committing, but it keeps on showing as modified
git clean
git stash
force a checkout on master, delete local develop branch, check out develop again (same result)
it even happens without IDE, if I stash I see a change immediately after

I'm stuck in an endless loop. How do I break out?

Answers (1)