You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
When there is no subdirectory, directoryRelative is set to datafiles/NEW, but there might be a file at datafiles. This will trigger the error because matchingFile.directoryRelative != directoryRelative, which effectively causes any file at the root level of the project's included files to always trigger conflicts.
I think we should just stop checking the subdirectory mismatch and overwrite the destination file. The change will show up in the git history anyways so the end-user can discern whether this is a mistake that requires renaming or that it is fine.
The text was updated successfully, but these errors were encountered:
stitch/src/lib/components/Gms2IncludedFile.ts
Line 121 in 59c195b
When there is no
subdirectory
,directoryRelative
is set todatafiles/NEW
, but there might be a file atdatafiles
. This will trigger the error becausematchingFile.directoryRelative != directoryRelative
, which effectively causes any file at the root level of the project's included files to always trigger conflicts.I think we should just stop checking the subdirectory mismatch and overwrite the destination file. The change will show up in the git history anyways so the end-user can discern whether this is a mistake that requires renaming or that it is fine.
The text was updated successfully, but these errors were encountered: