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

[Jay_Baker]

Have you tried this one?

Using Git with Ignition projects

Ok, here’s my solution, which mostly seems to work pretty well. Step 1: Create a powershell file called something like ps_fix_resource.ps1, containing: filter sed($before,$after) { %{$_ -replace $before,$after} } $input |sed '"actor": ".*"' '"actor": "system"'|sed '"timestamp": ".*"' '"timestamp": "2022-01-01T00:00:00Z"'|sed '"lastModificationSignature": ".*"' '"lastModificationSignature": "4a15e0122c9a955ca05b407bd9fa06810c1a05bd02f35e6ab4cc38c0654af46"' This replaces your name (as ‘actor’) …