79dd00a12c
Every conflict was a build artifact — another agent had pushed a full rebuild of all 23 bundles. Minified .js and baked-SRI leaf pages are generated files: merging their text is meaningless and can produce a bundle that matches neither side, so they are resolved by taking one side and then rebuilding from the merged source. The incoming diff carries 68 source files, among them library/composables/ useMapInstance.js and the dashboard/gospel catalogues in 10 locales, so the rebuild is all 23 bundles and not only the ones I touched — regenerating the tree without rebuilding has shipped a stale .js here before. |
||
|---|---|---|
| .. | ||
| __gallery | ||
| assets | ||
| doxa-maps | ||
| .gitignore | ||
| index.html | ||