-
Notifications
You must be signed in to change notification settings - Fork 14
Using the submodules
Adam Ginsburg edited this page May 14, 2015
·
3 revisions
As of https://github.com/camelot-project/frontend/pull/11, there is a database backend that will create a pull request with suggested changes whenever additions are made to the database.
In order to facilitate this, we have created submodules
. These are exceedingly confusing bits of git hackery, but they are also very useful.
When you git pull upstream master
after this branch has been merged, you will get an error message like:
error: Updating the following directories would lose untracked files in it:
database
uploads
You will need to remove or rename these directories before you can pull. Just rename/remove them, then try to pull again.