Let .env.local override .env, and resolve duplicate keys last-wins - #579
Draft
kieran-osgood-shopify wants to merge 1 commit into
Draft
Conversation
11 tasks
Contributor
Author
This was referenced Aug 5, 2026
kieran-osgood-shopify
force-pushed
the
kieran-osgood/env-local-overlay
branch
from
August 5, 2026 11:06
a2ee887 to
a02421c
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/apple-pay-merchant-identifier
branch
2 times, most recently
from
August 5, 2026 11:35
3326bed to
ef9dbba
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/env-local-overlay
branch
2 times, most recently
from
August 5, 2026 11:45
131eb0a to
eba4266
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/apple-pay-merchant-identifier
branch
from
August 5, 2026 11:45
ef9dbba to
578c24e
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/env-local-overlay
branch
from
August 5, 2026 12:33
eba4266 to
e94d61b
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/apple-pay-merchant-identifier
branch
from
August 5, 2026 12:33
578c24e to
ff257a4
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/env-local-overlay
branch
from
August 6, 2026 15:48
e94d61b to
09826ea
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/apple-pay-merchant-identifier
branch
2 times, most recently
from
August 6, 2026 17:30
055b73d to
331300f
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/env-local-overlay
branch
2 times, most recently
from
August 7, 2026 11:05
3da5174 to
6c4b15a
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/apple-pay-merchant-identifier
branch
from
August 7, 2026 11:26
0b7623f to
97b992e
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/env-local-overlay
branch
2 times, most recently
from
August 7, 2026 13:51
6d1b182 to
f69378a
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/apple-pay-merchant-identifier
branch
2 times, most recently
from
August 7, 2026 14:15
4652f31 to
fd8babb
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/env-local-overlay
branch
from
August 7, 2026 14:15
f69378a to
508a790
Compare
setup_storefront_env took the first match for a duplicated key while run_maestro took the last. Last-wins is the predictable rule: in a file kept by hand, the last uncommented assignment is the active one. .env.local now overrides .env per key. Nothing writes to .env.local, so it survives every sync and gives a developer a place to point the sample apps at their own store. Write decisions about .env deliberately ignore the overlay. Resolved values carry overrides, so writing them back would make an override permanent. While .env.local exists, .env is left alone and the reason is reported. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
kieran-osgood-shopify
force-pushed
the
kieran-osgood/apple-pay-merchant-identifier
branch
from
August 7, 2026 15:41
fd8babb to
e07a3ec
Compare
kieran-osgood-shopify
force-pushed
the
kieran-osgood/env-local-overlay
branch
from
August 7, 2026 15:41
508a790 to
ab0ce29
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes are you making?
How to test
Before you merge
Important
platforms/swift/README.mdand/orplatforms/android/README.md)Releasing a new Swift version?
ShopifyCheckoutKit.podspecplatforms/swift/Sources/ShopifyCheckoutKit/ShopifyCheckoutKit.swiftplatforms/swift/README.md(major version only)Releasing a new Embedded Checkout Protocol version?
embeddedCheckoutProtocolAndroidinplatforms/android/gradle/libs.versions.tomlprotocol/languages/kotlin/embedded-checkout-protocol/api/embedded-checkout-protocol.apiif the public API changedReleasing a new Android version?
checkoutKitAndroidinplatforms/android/gradle/libs.versions.tomlplatforms/android/README.mdTip
See the Contributing documentation for the full release process per platform.