Enable better conflict management for deployment by default#11229
Merged
petebacondarwin merged 6 commits intomainfrom Nov 12, 2025
Merged
Conversation
🦋 Changeset detectedLatest commit: 50d255d The changes in this PR will be included in the next version bump. Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
create-cloudflare
@cloudflare/kv-asset-handler
miniflare
@cloudflare/pages-shared
@cloudflare/unenv-preset
@cloudflare/vite-plugin
@cloudflare/vitest-pool-workers
@cloudflare/workers-editor-shared
@cloudflare/workers-utils
wrangler
commit: |
90bef04 to
6f5b407
Compare
Contributor
|
Failed to automatically backport this PR's changes to Wrangler v3. Please manually create a PR targeting the Depending on your changes, running Notes:
|
cd07a17 to
a7f7539
Compare
penalosa
approved these changes
Nov 10, 2025
petebacondarwin
requested changes
Nov 11, 2025
a7f7539 to
de6606f
Compare
Co-authored-by: Pete Bacon Darwin <pete@bacondarwin.com>
petebacondarwin
approved these changes
Nov 12, 2025
Merged
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
4 participants
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.
Fixes #10235
The changes here enable the remote config diffing against dash deployments during
wrangler deploys by default, while still allowing users to opt out of it via--experimental-remote-diff-check=false(the flag will be removed as a followup in a few weeks if all goes well).wrangler deploy's better config conflict management cloudflare-docs#26401