Week 4 at Disco Tray Studios

This week, we refactored the schema of our project.

• First, Annabel and I sat down with Dr. Goadrich to narrow down the previous schema into something more concise and effecient.
• Then, we rebuilt the models to match the new schema.
• Then, we rescaffolded the pages.

Creating a pull request onto the main project raises a merge conflict, which halted our progress for the week here. The merge conflict is the CivicAction.db file. I just noticed that we have a second .gitignore file in the project, which we never added the .db file to. I’m hoping that will fix the merge conflict and allow us to keep making progress.