From 688ba6cfde49c8da8f0d512d327accaf19c3f13a Mon Sep 17 00:00:00 2001 From: Doxa Maps Date: Sat, 26 Sep 2026 07:50:17 +0000 Subject: [PATCH] Regenerate the built tree: ten files had merge-conflict markers committed in them MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ★ THE PRECONDITION WAS RIGHT AND I COULD NOT READ IT. It refused four landings saying "a committed composite is not what its source builds" without naming one, and my own freshness run said clean. Running check-composite-freshness at the precondition's exact scope threw instead: a SyntaxError parsing public/dx-maps/manifest.json — '<<<<<<< HEAD' at position 2317. Ten built files carried committed conflict markers: both manifests and eight leaf pages. They came in through my own merge resolutions. 'git restore --ours' on a conflicted path gives MY side — and once markers were committed once, my side had them, so every later merge carried them forward and the precondition kept refusing a tree it literally could not parse. Regenerating from source clears all ten. The lander now checks for markers before committing built output, because a gate that cannot parse its input fails in a way that looks like the thing it was checking for. --- .../big-picture/big-picture/index.html | 4 -- .../big-picture/frontier/index.html | 4 -- .../big-picture/big-picture/index.html | 4 -- .../dashboard-plus-grid/default/index.html | 4 -- .../dashboard-plus-grid/index.html | 4 -- public/dx-maps/doxa-maps-spa/manifest.json | 48 ++++--------------- .../doxa-research-map/research-map/index.html | 4 -- .../research-map/maplibre/index.html | 4 -- public/dx-maps/manifest.json | 48 ++++--------------- .../research-dashboard/index.html | 4 -- 10 files changed, 16 insertions(+), 112 deletions(-) diff --git a/public/dx-maps/big-picture/big-picture/big-picture/index.html b/public/dx-maps/big-picture/big-picture/big-picture/index.html index cf0d59c63..f921e9d2e 100644 --- a/public/dx-maps/big-picture/big-picture/big-picture/index.html +++ b/public/dx-maps/big-picture/big-picture/big-picture/index.html @@ -43,11 +43,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b -<<<<<<< HEAD -======= - ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b -<<<<<<< HEAD -======= - ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b -<<<<<<< HEAD -======= - ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b -<<<<<<< HEAD -======= - ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b \n\n" -======= - "script": "\n\n" ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "script": "\n\n" }, "instances": [ { @@ -222,11 +214,7 @@ "bundle": "dashboard-plus-grid", "scriptUrl": "./dashboard-plus-grid/dashboard-plus-grid.js", "output": "dx-maps/dashboard-plus-grid/dashboard-plus-grid.js", -<<<<<<< HEAD - "integrity": "sha384-rtrFf2jOvKX8qLwFiufUlxmSsy5qrtpky/003/WrfUoNlXLILiPzkk5YED709p2h", -======= - "integrity": "sha384-X3RgGbiXGIZfp85WQ5H4/NyF3soIpCRnU4vsNH3+TNJSrBcUMSMn2E3QEAYBBtXN", ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "integrity": "sha384-dmlUkR/A54stQ9oHUOIrUbiGInFwp/pn8O6fJhlPKG7gfreqLjIQFTP8xkB1FOz9", "elements": [ "dashboard-plus-grid" ], @@ -246,11 +234,7 @@ "scriptUrl": "./dashboard-plus-grid/dashboard-plus-grid.js", "embed": { "iframe": "", -<<<<<<< HEAD - "script": "\n\n\n\n" -======= - "script": "\n\n\n\n" ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "script": "\n\n\n\n" }, "instances": [ { @@ -369,11 +353,7 @@ "bundle": "doxa-research-map", "scriptUrl": "./doxa-research-map/doxa-research-map.js", "output": "dx-maps/doxa-research-map/doxa-research-map.js", -<<<<<<< HEAD - "integrity": "sha384-o3edzaXwm6DtvJ776UWtoUzd7pnH3eJccWnxqZOyMRReBbz+E+LJ1/NGUlga7ZzN", -======= - "integrity": "sha384-k0nz1QuX66wXKOYWggLCcX7RoWltaPTLMSV9Lg+xHl8MqJYU1JEarvlXkwd0OcNE", ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "integrity": "sha384-bvTiAgCxcMhofkEk7L9ee0Ytbg1DmpqFFBE/YwJ2H0t26QBz1yMu5l63vxQyyi0F", "elements": [ "doxa-research-map" ], @@ -389,11 +369,7 @@ "scriptUrl": "./doxa-research-map/doxa-research-map.js", "embed": { "iframe": "", -<<<<<<< HEAD - "script": "\n\n\n\n" -======= - "script": "\n\n\n\n" ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "script": "\n\n\n\n" }, "instances": [ { @@ -968,11 +944,7 @@ "bundle": "research-dashboard", "scriptUrl": "./research-dashboard/research-dashboard.js", "output": "dx-maps/research-dashboard/research-dashboard.js", -<<<<<<< HEAD - "integrity": "sha384-Wh4N1CM0tPFQuIdFh90h8H1Nyfv2vD2zs7VaXXFXygVAJ40q2gSfkHRKN4z+P459", -======= - "integrity": "sha384-NgJkt7xye7Cs2JthjMLa+DXlLKpsZScl5JY2WzjQkOUonhOoKAhQ1t2mah/AqW62", ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "integrity": "sha384-oH86UU3SToQavYwTde0Kn2T7eduoXE38Ned4njkYGa17SJxvFQvEIhOH3SOtapYa", "elements": [ "research-dashboard-map" ], @@ -988,11 +960,7 @@ "scriptUrl": "./research-dashboard/research-dashboard.js", "embed": { "iframe": "", -<<<<<<< HEAD - "script": "\n\n\n\n" -======= - "script": "\n\n\n\n" ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "script": "\n\n\n\n" }, "bundle": "research-dashboard" } diff --git a/public/dx-maps/doxa-research-map/research-map/index.html b/public/dx-maps/doxa-research-map/research-map/index.html index 9be7fd16e..bfca1dbf6 100644 --- a/public/dx-maps/doxa-research-map/research-map/index.html +++ b/public/dx-maps/doxa-research-map/research-map/index.html @@ -36,11 +36,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b -<<<<<<< HEAD -======= - ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b \n\n" -======= - "script": "\n\n" ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "script": "\n\n" }, "instances": [ { @@ -222,11 +214,7 @@ "bundle": "dashboard-plus-grid", "scriptUrl": "./dashboard-plus-grid/dashboard-plus-grid.js", "output": "dx-maps/dashboard-plus-grid/dashboard-plus-grid.js", -<<<<<<< HEAD - "integrity": "sha384-rtrFf2jOvKX8qLwFiufUlxmSsy5qrtpky/003/WrfUoNlXLILiPzkk5YED709p2h", -======= - "integrity": "sha384-X3RgGbiXGIZfp85WQ5H4/NyF3soIpCRnU4vsNH3+TNJSrBcUMSMn2E3QEAYBBtXN", ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "integrity": "sha384-dmlUkR/A54stQ9oHUOIrUbiGInFwp/pn8O6fJhlPKG7gfreqLjIQFTP8xkB1FOz9", "elements": [ "dashboard-plus-grid" ], @@ -246,11 +234,7 @@ "scriptUrl": "./dashboard-plus-grid/dashboard-plus-grid.js", "embed": { "iframe": "", -<<<<<<< HEAD - "script": "\n\n\n\n" -======= - "script": "\n\n\n\n" ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "script": "\n\n\n\n" }, "instances": [ { @@ -369,11 +353,7 @@ "bundle": "doxa-research-map", "scriptUrl": "./doxa-research-map/doxa-research-map.js", "output": "dx-maps/doxa-research-map/doxa-research-map.js", -<<<<<<< HEAD - "integrity": "sha384-o3edzaXwm6DtvJ776UWtoUzd7pnH3eJccWnxqZOyMRReBbz+E+LJ1/NGUlga7ZzN", -======= - "integrity": "sha384-k0nz1QuX66wXKOYWggLCcX7RoWltaPTLMSV9Lg+xHl8MqJYU1JEarvlXkwd0OcNE", ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "integrity": "sha384-bvTiAgCxcMhofkEk7L9ee0Ytbg1DmpqFFBE/YwJ2H0t26QBz1yMu5l63vxQyyi0F", "elements": [ "doxa-research-map" ], @@ -389,11 +369,7 @@ "scriptUrl": "./doxa-research-map/doxa-research-map.js", "embed": { "iframe": "", -<<<<<<< HEAD - "script": "\n\n\n\n" -======= - "script": "\n\n\n\n" ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "script": "\n\n\n\n" }, "instances": [ { @@ -968,11 +944,7 @@ "bundle": "research-dashboard", "scriptUrl": "./research-dashboard/research-dashboard.js", "output": "dx-maps/research-dashboard/research-dashboard.js", -<<<<<<< HEAD - "integrity": "sha384-Wh4N1CM0tPFQuIdFh90h8H1Nyfv2vD2zs7VaXXFXygVAJ40q2gSfkHRKN4z+P459", -======= - "integrity": "sha384-NgJkt7xye7Cs2JthjMLa+DXlLKpsZScl5JY2WzjQkOUonhOoKAhQ1t2mah/AqW62", ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "integrity": "sha384-oH86UU3SToQavYwTde0Kn2T7eduoXE38Ned4njkYGa17SJxvFQvEIhOH3SOtapYa", "elements": [ "research-dashboard-map" ], @@ -988,11 +960,7 @@ "scriptUrl": "./research-dashboard/research-dashboard.js", "embed": { "iframe": "", -<<<<<<< HEAD - "script": "\n\n\n\n" -======= - "script": "\n\n\n\n" ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b + "script": "\n\n\n\n" }, "bundle": "research-dashboard" } diff --git a/public/dx-maps/research-dashboard/research-dashboard/index.html b/public/dx-maps/research-dashboard/research-dashboard/index.html index bbd2e4196..4f2bdc249 100644 --- a/public/dx-maps/research-dashboard/research-dashboard/index.html +++ b/public/dx-maps/research-dashboard/research-dashboard/index.html @@ -36,11 +36,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b