Built in merge tool changes my line endings from CLRF to LF

[owenpearson]

whenever i use the built in merge tool to resolve conflicts the resulting files have LF line endings instead of CLRF (as they did before).

[DanPristupov]

Thank you. I will investigate that.

[felixhirt]

@DanPristupov I don't like to bump things normally, but since the internal fork merge resolve editor gets better and better i use it more and more. And with that, this issue suddenly becomes much more important (for me at least). Is there any chance to see this fixed any time soon?

One of our tools has issues if the files are not using CRLF...

[lukisjarvis]

Hi @DanPristupov
I am currently evaluating this software with a view to purchase, I also am having this issue. I am wondering if you would consider fixing as I would love to use the inbuilt merge tool.
Thank you. (This is the Windows version)

[tylerohlsen]

For me, this is the single most frustrating feature of Fork. I'm sad to see this was opened in 2019 and still isn't resolved. I love Fork and have recommended it to many others. I would love to see this fixed!

[dkiessling]

I see the same issue.

I'm on Windows 10 with git config set to
autocrlf = true.

The C# files in Visual Studio 2022 (17.7.4) are set to UTF-8 with CRLF.
After I resolved a merge conflict in Fork 1.89.2.0 and opening the file in Visual Studio, I see a Message of Visual Studio that the file contains a mixture of CRLF and LF line endings.

[Xythus]

This is unfortunately still an issue. The software that needs to parse my files does not handle LF line endings correctly, which means that any files touched by Fork's merge tool would have to be reconverted to CRLF line endings. Very frustrating