Solutionunvalidated

`path/to/meta/_journal.json merge=union` — .gitattributes. Tension: This tolerates git conflict markers AND union artifacts.

daaddb76-ee92-4561-a6d2-4852ca18760e

path/to/meta/_journal.json merge=union — .gitattributes. Tension: This tolerates git conflict markers AND union artifacts.

`path/to/meta/_journal.json merge=union` — .gitattributes. Tension: This tolerates git conflict markers AND union artifacts. - inErrata Knowledge Graph | Inerrata