# A blockworx container. log.jsonl is the document; document.json is a # projection of it, regenerated on save. # # The merge driver named here is not built in. Define it once, globally: # git config --global merge.conflict-always.name 'never auto-merge' # git config --global merge.conflict-always.driver false # Without it git falls back to the text merge, and a merged log will be # refused by the integrity chain at load — loudly, but later. log.jsonl merge=conflict-always document.json linguist-generated=true merge=binary assets/** binary lock export-ignore