[next]: stabilize failOnPrerenderConflict

astro.sidebar.ts

@@ -148,7 +148,6 @@ export const sidebar = [
 					'reference/experimental-flags/client-prerender',
 					'reference/experimental-flags/content-intellisense',
 					'reference/experimental-flags/chrome-devtools-workspace',
-					'reference/experimental-flags/fail-on-prerender-conflict',
 				],
 			}),
 			'reference/legacy-flags',

src/content/docs/en/guides/upgrade-to/v6.mdx

@@ -291,7 +291,6 @@ const { Content, headings } = await render(post);
 
 <ReadMore> See [the Astro v5 upgrade guide](/en/guides/upgrade-to/v5/#legacy-v20-content-collections-api) for previous guidance about backwards compatibility of legacy collections in Astro v5 and full step-by-step instructions for upgrading legacy collections to the new Content Layer API.</ReadMore>
 
-
 ### Removed: `<ViewTransitions />` component
 
 <SourcePR number="14400" title="Remove deprecated ViewTransitions component"/>
@@ -554,7 +553,7 @@ Experimental flags allow you to opt in to features while they are in early devel
 
 Remove these experimental flags from your Astro config if you were previously using them:
 
-```js del={5-8} title="astro.config.mjs"
+```js del={5-9} title="astro.config.mjs"
 import { defineConfig } from 'astro/config';
 
 export default defineConfig({
@@ -563,6 +562,7 @@ export default defineConfig({
     preserveScriptOrder: true,
     staticImportMetaEnv: true,
     headingIdCompat: true,
+    failOnPrerenderConflict: true
   },
 })
 ```
@@ -576,10 +576,10 @@ export default defineConfig({
 - `preserveScriptOrder` (See below for breaking changes to [default `<script>` and `<style>` behavior](#changed-script-and-style-tags-are-rendered-in-the-order-they-are-defined).)
 - `staticImportMetaEnv` (See below for breaking changes to [`import.meta.env`](#changed-importmetaenv-values-are-always-inlined).)
 - `headingIdCompat` (See below for breaking changes to [Markdown heading ID generation](#changed-markdown-heading-id-generation).)
+- `prerenderConflictBehavior` (See below for breaking changes to [configurable prerendered routes conflict behavior](#changed-configurable-prerendered-routes-conflict-behavior).)
 
 <ReadMore>Read about exciting new features and more in [the v6.0 Blog post](https://astro.build/blog/astro-6/).</ReadMore>
 
-
 ## Changed Defaults
 
 Some default behavior has changed in Astro v5.0 and your project code may need updating to account for these changes.
@@ -924,6 +924,28 @@ export function getStaticPaths() {
 
 <ReadMore>Learn more about [dynamic SSG routes with `getStaticPaths()`](/en/guides/routing/#static-ssg-mode).</ReadMore>
 
+### Changed: configurable prerendered routes conflict behavior
+
+<SourcePR number="14826" title="feat(astro)!: stabilize failOnPrerenderConflict"/>
+
+In Astro 5.14, the `experimental.failOnPrerenderConflict` option was introduced to allow turning prerender conflict warnings into errors during the build process.
+
+Astro 6.0 stabilizes this option: it is now removed and replaced by `prerenderConflictBehavior`.
+
+#### What should I do?
+
+If you were previously using this experimental feature, you must [remove this experimental flag from your configuration](#experimental-flags) as it no longer exists and replace it with `prerenderConflictBehavior`:
+
+```js title="astro.config.mjs" ins={4}
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+  prerenderConflictBehavior: 'error',
+});
+```
+
+<ReadMore>Learn more about the [route priority order](/en/guides/routing/#route-priority-order).</ReadMore>
+
 ## Community Resources
 
 Know a good resource for Astro v5.0? [Edit this page](https://github.com/withastro/docs/edit/main/src/content/docs/en/guides/upgrade-to/v6.mdx) and add a link below!