json-template-merge

A git merge driver to be used in a deployment process to handle Shopify's JSON templates. It uses xdiff to create a diff from two source JSON templates and applies it as a patch to a live template.

Install

Install:

npm install json-template-merge

Update git config:

git config merge.json_template.driver "$(npm bin)/json-template-merge %A %O %B"
git config merge.json_template.name "Merge driver for JSON templates"

Create .gitattributes:

*.json merge=json_template