Git raises merge conflict when changes happen on adjacent lines
While helpful for a source code, it is nonsensical for structured data files like json, where changes to different keys happen often and are isolated by definition
Existing tools either don't do deep merge, or fail to produce expected output. And bringing whole node.js/deno into a cicd worker for a ~100 line js script is excessive
Key order is not preserved
Arrays could not be merged
Put binary to a known location, preferably in PATH
Run in you repo before merge:
git config merge.json.driver "json-merge-driver %O %A %B"
echo '*.json merge=json' >> .gitattributes
Licensed under Apache License version 2.0. See the LICENSE file for
details.