[Answered ]-Git- made changes on a local branch, checked out master, and master is now broken

by

2👍

✅

Possible causes:

  1. (Git) You forgot to git add files in the conceptCalendar branch, and they are still lying around when you checkout master.

  2. (Python) You have stale .pyc files in your project. Remove them.

  3. (Django) You forgot to makemigrations in the conceptCalendar branch

  4. (Django) You ran migrate on the conceptCalendar branch, your database schema has changed, but now the code on master reflects the old schema. Rebuild your database, or migrate backwards.

I’m betting my money on this last point. From the error you posted, i’m thinking that maybe a Form is extending ModelForm for a Model that changed in the other branch. Check that all fields exist in the underlying model, and in the database.

👤salezica

Leave a comment