Changes view in IntelliJ continues to list files where the only difference are LF vs CRLF

Question

I have 2 files that won't go away in the Changes view. If I look at the diff, it just tells me the committed version has LF line endings and the local version has CRLF line endings. I'm working on a Mac and I understand linux based systems use LF line endings and Windows use CRLF. Is there someway I can just convert these 2 files so all the line endings are LF?

Thanks.

Answer 1

I had the issue on Windows because I checked out the project using a Cygwin git.exe and IntelliJ used a git.exe from msysGit. Changing the git.exe under Settings -> Version Control -> Git -> Path to Git executable fixed the problem.

Answer 2

In your case, you could:

• convert those files

• set core.autocrlf to input:

  git config core.autocrlf input
  

• reset it (make sure you don't have any work in progress)

  git rm --cached -r .
  git reset --hard
  

See more at "git replacing LF with CRLF".