# What's your method for resolving resource.json git conflicts? **URL:** \ **Category:** Ignition\ **Created:** [May 26, 2022, 9:01pm UTC](https://forum.inductiveautomation.com/t/whats-your-method-for-resolving-resource-json-git-conflicts/60096 "2022-05-26T21:01:51Z")\ **Posts on this page:** 1\ **Showing post:** 20
**Author:** ![cesrom](https://avatars.discourse-cdn.com/v4/letter/c/ea666f/32.png) [@cesrom](https://forum.inductiveautomation.com/u/cesrom)\ **Post date:** [March 1, 2023, 9:05pm UTC](https://forum.inductiveautomation.com/t/whats-your-method-for-resolving-resource-json-git-conflicts/60096/20 "2023-03-01T21:05:37Z")
I managed to solve all conflicts by doing the following: > [@Ignition touching project files every five minutes on Windows](https://forum.inductiveautomation.com/t/ignition-touching-project-files-every-five-minutes-on-windows/65488/8): > > 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 --- _[View the full topic](https://forum.inductiveautomation.com/t/whats-your-method-for-resolving-resource-json-git-conflicts/60096)._