strtus/Vercel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak app refactor FAQ

Browse Source
This commit is contained in:
Sam Becker 2025-02-17 19:24:18 -06:00
parent f26aa7dff7
commit 46ac8ac86e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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. > 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? #### 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.