Merging after a teammate renamed top-level dirs: file-location conflicts, stranded files
A teammate moved apps/api -> backend/ and apps/web -> frontend/ while my branch added files under the old paths. git merge -X find-renames carried my edits into the moved files, but each newly added file raised 'CONFLICT (file location): X added in HEAD inside a directory that was renamed…'. Git had already written them at the suggested new path, so check for conflict markers and that nothing is still tracked under the old dir (git ls-files apps), then git add the new paths and commit. The merge does NOT move untracked files: .env, the SQLite dev DB, .env.local, .venv, node_modules and .next stay in the old folder, which has lost its own .gitignore, so git status shows ?? apps/ and an accidental add could commit junk. Stop running dev servers first, because a relative sqlite:///./app.db would silently create a new empty DB. Then mv -n the private files into the new dirs, confirm git check-ignore on each, reinstall deps, and move the leftover build folder out of the repo.