Modified file is completely grey and formatted incorrectly?

[Richard Wright]

We've encountered an interesting occurence in our latest pull request in which one of the files is entirely grey and formatted incorrectly in the diff viewer. Basically, the file repeats itself in the middle of the preview. It isn't like this in the source files on anybody's system. Any idea what caused it and how to fix it?

[Christian Glockner]

Hi Richard,

Bitbucket Server uses git diff to compute the diff between two versions of a file, so I suggest running that command to see if you see similar output.

Cheers,

Christian

Premier Support Engineer

Atlassian

[Richard Wright]

When I do a git diff, there are ^M's where new lines should be. I've looked up how to fix it but I haven't found a solution that works just yet.

[Christian Glockner]

Hi Richard,

That shows that the problem actually lies outside of Bitbucket Server, and you might be dealing with a corrupt file there.

Cheers,

Christian

Premier Support Engineer

Atlassian