I have 2 json files that both got changed at different times by people working in the repo.

An example of a diff that would result:

        "transforms": [
          {
<<<<<<< HEAD
            "code": "tself.getChild("root").refreshAlarmConfigurationValues()",
=======
            "code": "tself.getChild("root").refreshAlarmConfigurationValues()n",
>>>>>>> 20691f91 (Fixed all tile default node reference, ensured all tiles updating)
            "type": "script"
          }
        ],

In this instance, it’s not hard to diff the files cause the only difference between those 2 blocks of code is the trailing newline. But when there’s more substantial changes, it becomes difficult to parse through them.

How can I diff/merge these files in a way I can actually read and compare? The code blocks are always encoded python scripts.