{ "base": "fefd54e13", "landing": "f8276c5eb3ecb0aad353ee65e3dd8f7faac5dd87", "overlaps": [ "packages/bus/src/broker.mjs", "packages/bus/src/runtime.mjs", "packages/business/src/business.mjs", "packages/business/src/instance-settings.mjs", "packages/business/tests/business.test.mjs", "packages/business/tests/instance-settings.test.mjs", "packages/cli/src/launcher.mjs", "packages/cli/tests/launcher.test.mjs", "packages/library/src/index.mjs" ], "initialConflicts": [ "packages/bus/src/broker.mjs", "packages/business/src/business.mjs" ], "remainingConflicts": [], "resolutions": { "packages/bus/src/broker.mjs": "retain landed hostKeys constructor parameter and add library parameter", "packages/business/src/business.mjs": "retain landed CREATIVE_DEFINITIONS import and add checkMapping import" }, "sourcePaths": [ { "path": "packages/bus/src/broker.mjs", "merged": true, "sameAsEarlyTree": false, "earlySha256": "dca11dd58561bf3f399d18d7521aefa93f43e0ee3de9c532c1da073ce5a17466", "sha256": "925b3dd6744565349ec421a58b3374ce3d21181e6c2d3d32ffb99c79271b9450" }, { "path": "packages/bus/src/runtime.mjs", "merged": true, "sameAsEarlyTree": false, "earlySha256": "6f69e9fb838cf1d8ee60d1b7090395193d3dbfdc6492a401a4b72c356c371ca9", "sha256": "c759e665514a5bcad40536bc9f979837187fe6523462b3c0a0687182885c3ac6" }, { "path": "packages/bus/src/server.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "207c7a76752c753ef7380f18f9ce1a4f23e8fa35142973b6358aaf0c45f44899", "sha256": "207c7a76752c753ef7380f18f9ce1a4f23e8fa35142973b6358aaf0c45f44899" }, { "path": "packages/bus/tests/library.test.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "58d839709e005571b398a11abda5a50f542bab0e37bd97b72f43cde926434301", "sha256": "58d839709e005571b398a11abda5a50f542bab0e37bd97b72f43cde926434301" }, { "path": "packages/business/src/business.mjs", "merged": true, "sameAsEarlyTree": false, "earlySha256": "e132f92211cd35f951e85ff5e90471a2316755cb35ad7eabf516e780ce6c13ad", "sha256": "5fd3fee664d3e70153d988b4c1a42406f888a31b3927fa52375e66619d8cec59" }, { "path": "packages/business/src/cli.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "31cfe9090900169416e1207dc6db865b046439273917e9de442add4159c89eb3", "sha256": "31cfe9090900169416e1207dc6db865b046439273917e9de442add4159c89eb3" }, { "path": "packages/business/src/instance-settings.mjs", "merged": true, "sameAsEarlyTree": false, "earlySha256": "04d61c1ec89a5d67da75aede46c3a8e2197aadd63b11bef8e4fc37d90e8862cf", "sha256": "3873411688d927336a909d0299acddeba92a653102c660d276471f5a0f6eebd3" }, { "path": "packages/business/src/organization.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "eaa650499d2d078552a2c0e5b13a6126e0aca02f73160032a7325b3f5aa90964", "sha256": "eaa650499d2d078552a2c0e5b13a6126e0aca02f73160032a7325b3f5aa90964" }, { "path": "packages/business/src/resolve.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "712183465fee099606223d84423afc54e3386a0c8e468c68d5ac39c1e676d109", "sha256": "712183465fee099606223d84423afc54e3386a0c8e468c68d5ac39c1e676d109" }, { "path": "packages/business/tests/business.test.mjs", "merged": true, "sameAsEarlyTree": false, "earlySha256": "55aafd3f0eea816d5f42283b7b74323dd32a698d7b95dd9cc54529dbf7b16058", "sha256": "910f924d90b6f9b18c1f36d97cebd0b7a0a15a080b73530c4fb847bfd435fb3f" }, { "path": "packages/business/tests/cli.test.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "d54ba2338bcdfec22764030cf3ec9e3464ab275b15321d6d1b039169ea37fd85", "sha256": "d54ba2338bcdfec22764030cf3ec9e3464ab275b15321d6d1b039169ea37fd85" }, { "path": "packages/business/tests/instance-settings.test.mjs", "merged": true, "sameAsEarlyTree": false, "earlySha256": "c0959f3af3df653bbf469471d3bbe3f28bc4478cba8ba57910af7f09498c4c3f", "sha256": "072e25c5237e1be4294c7a4a95daa2ab593832786013e1283b19725c330647c1" }, { "path": "packages/business/tests/library-projects-protected.test.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "cfc726ec7bf73c1dc9fc6395cba85e374b7a006bac45bd8c47c969550557147f", "sha256": "cfc726ec7bf73c1dc9fc6395cba85e374b7a006bac45bd8c47c969550557147f" }, { "path": "packages/business/tests/resolve.test.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "c74af44a83ee918196e2c1016b62786e757c0ae774c9b1613280d3fbbf3ffb22", "sha256": "c74af44a83ee918196e2c1016b62786e757c0ae774c9b1613280d3fbbf3ffb22" }, { "path": "packages/cli/src/config.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "ab7b9f452123b6f7e98f4f59cbb3cc4483fd296e4af5522412410ee53d1b20e0", "sha256": "ab7b9f452123b6f7e98f4f59cbb3cc4483fd296e4af5522412410ee53d1b20e0" }, { "path": "packages/cli/src/launcher.mjs", "merged": true, "sameAsEarlyTree": false, "earlySha256": "2272232dbe6c362eddb23ad903987fd4b8e0ca1eb94dbe93b66b3e785e7d0712", "sha256": "d8a870d8eb8254adfd576688696705359fefbf517b40e5d7482500bf27941022" }, { "path": "packages/cli/tests/launcher.test.mjs", "merged": true, "sameAsEarlyTree": false, "earlySha256": "38fb51c15764333642d75db7fb358d611e448049cf894b24686ea6cf2cf169c4", "sha256": "99234f247e8414120d2fd214efd590e9d573eca86180d7b775cb506ac1c12c78" }, { "path": "packages/cli/tests/stack-release-fixture.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "86a3c15446d4c119206097c754cd15f5bef7b7e93c9f16e9d8696ec8c475eea9", "sha256": "86a3c15446d4c119206097c754cd15f5bef7b7e93c9f16e9d8696ec8c475eea9" }, { "path": "packages/cli/tests/stack-release.test.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "aa63fadca8b3a51e7af1ff7560fd2645f3ef56bf4e5625b2d5a5f6946db40996", "sha256": "aa63fadca8b3a51e7af1ff7560fd2645f3ef56bf4e5625b2d5a5f6946db40996" }, { "path": "packages/cli/tests/trackers-boot.test.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "c90493e45bfa09bf0b01600aaf04d6ecd79d939357beacc1a9cd65f958bb7c22", "sha256": "c90493e45bfa09bf0b01600aaf04d6ecd79d939357beacc1a9cd65f958bb7c22" }, { "path": "packages/library/src/index.mjs", "merged": true, "sameAsEarlyTree": false, "earlySha256": "b80e6c27daf908a0e71fcc1e5e8c91d05e857790bd77d92e06ff086ab3623306", "sha256": "ecda99dea46390b81fffa6f414d56a13737233e01d883b82cd186e0e21b6c4d1" }, { "path": "packages/library/src/mirror.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "75ce08fba0956c846f2ca9ab1b565974657925f94ac952c720e7308783946480", "sha256": "75ce08fba0956c846f2ca9ab1b565974657925f94ac952c720e7308783946480" }, { "path": "packages/library/tests/mirror.test.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "e96473be70ece8c8232ce5325822244b593f273371b74b4126920654cde9d72c", "sha256": "e96473be70ece8c8232ce5325822244b593f273371b74b4126920654cde9d72c" }, { "path": "packages/project/src/paths.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "bd9debcf3f9bb92560e74f220a0b108dfe24154bc6d1fb03c5ec414356d451f9", "sha256": "bd9debcf3f9bb92560e74f220a0b108dfe24154bc6d1fb03c5ec414356d451f9" }, { "path": "packages/project/tests/project.test.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "0ebe1862ce70f26c4a6a44304182327f9a6944d16cc87f674fbb1d32e08ac602", "sha256": "0ebe1862ce70f26c4a6a44304182327f9a6944d16cc87f674fbb1d32e08ac602" }, { "path": "packages/seat/src/checkout.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "859201bd192522e51c33b86ef45f73487b27cdfc48ea7e4e09870e26d056048a", "sha256": "859201bd192522e51c33b86ef45f73487b27cdfc48ea7e4e09870e26d056048a" }, { "path": "packages/seat/tests/checkout.test.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "663040d7c737aba6403e6397bacf1325b558cc14df3e5677f0a28f9499c45127", "sha256": "663040d7c737aba6403e6397bacf1325b558cc14df3e5677f0a28f9499c45127" }, { "path": "packages/webui/src/cli.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "e98fd2fe4e621d5b4fa1ed95c4d4585469e7ab7a11dd379dc541dddb1b1a1f02", "sha256": "e98fd2fe4e621d5b4fa1ed95c4d4585469e7ab7a11dd379dc541dddb1b1a1f02" }, { "path": "packages/webui/tests/library-cli.test.mjs", "merged": false, "sameAsEarlyTree": true, "earlySha256": "1983912b76f01f8e6d0c564e3bbcd763c0b2c44044988b192ef827446f98556c", "sha256": "1983912b76f01f8e6d0c564e3bbcd763c0b2c44044988b192ef827446f98556c" } ] }