What's your method for resolving resource.json git conflicts?

[thecesrom]

I managed to solve all conflicts by doing the following:

Ignition touching project files every five minutes on Windows

In my setup, I already had a .gitattributes global file. So I just had to add the following: Before: *.md diff=markdown *.py diff=python After: * text=auto *.json text eol=lf *.md text diff=markdown eol=lf *.py text diff=python eol=lf I had already set autocrlf to true on my .gitconfig global settings. But @Craig.Lovold's suggestion is what solved this issue. Thanks everyone for your suggestions!

Hope that helps