Closed poshaughnessy closed 6 years ago
Moving PWA project in from: https://github.com/poshaughnessy/things-gateway-bluetooth-pwa
Adding as a webapp subdirectory here.
webapp
NB. History kept using the technique from: http://www.nomachetejuggling.com/2011/09/12/moving-one-git-repo-into-another-as-subdirectory/
(For reference, I also needed to add --allow-unrelated-histories: https://stackoverflow.com/questions/38255655/trying-to-pull-files-from-my-github-repository-refusing-to-merge-unrelated-his).
--allow-unrelated-histories
Moving PWA project in from: https://github.com/poshaughnessy/things-gateway-bluetooth-pwa
Adding as a
webappsubdirectory here.NB. History kept using the technique from: http://www.nomachetejuggling.com/2011/09/12/moving-one-git-repo-into-another-as-subdirectory/
(For reference, I also needed to add
--allow-unrelated-histories: https://stackoverflow.com/questions/38255655/trying-to-pull-files-from-my-github-repository-refusing-to-merge-unrelated-his).