Begin forwarded message:From: Waheed Ahmed <wah...@edx.org>Subject: Migration issue and fix to reset database state: Duplicate Column NameDate: August 9, 2017 at 12:09:35 PM EDTCc: "Engineering - All (Employees, Contractors)" <eng...@edx.org>A migration was reverted from master during the last release. If you run into the following error:django.db.utils.OperationalError: (1060, \"Duplicate column name 'sailthru_welcome_template'\")You can do the following to reset the database state:
- git checkout b83925316868efcbe45ace0f3ee7df5774c6d6a6 (commit before the revert)
- /edx/bin/edxapp-migrate-lms email_marketing 0006 (to remove "sailthru_welcome_template" column)
- git checkout master (or wherever you were)
RegardsWaheed AhmedSoftware Engineer