From 46ac8ac86edd51e4d82da1630b4baf8f0d5accae Mon Sep 17 00:00:00 2001 From: Sam Becker Date: Mon, 17 Feb 2025 19:24:18 -0600 Subject: [PATCH] Tweak app refactor FAQ --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd6a9635..6109dee3 100644 --- a/README.md +++ b/README.md @@ -304,4 +304,4 @@ Vercel Postgres can be switched to another Postgres-compatible, pooling provider > Possibly. See [Issue #116](https://github.com/sambecker/exif-photo-blog/issues/116) for discussion. #### Why am I seeing many merge conflicts when syncing my fork? -> Previous versions of this template stored "app directory" files in `/src`, and key functionality in `/src/site`. If you've made customizations and are having difficulty merging updates, consider moving your `/src/app` files to `/`, and renaming `src/site` to `/src/app`. Other structural changes include moving `tailwind.css` and `middleware.ts` to `/`. Lastly, it may be helpful to review [PR #195](https://github.com/sambecker/exif-photo-blog/pull/195) for an overview of the most significant changes. +> Previous versions of this template stored Next.js "App Router" files in `/src`, and app-level functionality in `/src/site`. If you've made customizations and are having difficulty merging updates, consider moving `/src/app` files to `/`, and renaming `src/site` to `/src/app`. Other structural changes include moving `tailwind.css` and `middleware.ts` to `/`. Additionally, it may be helpful to review [PR #195](https://github.com/sambecker/exif-photo-blog/pull/195) for an overview of the most significant changes.