Safe way to go back to master after develop branch?

So I switched myself over to develop to resolve the 123.mkv issue recently and now that it’s fixed I tried to flip back to master. However, I soon started having a lot of internal server errors doing various functions. The logs are tattered with failures similar to the following.

Request Failed: SQL logic error or missing database
no such column: t0.GrabDelay

I verified and reset permissions in the filesystem and restarted Sonarr. Nothing worked…until I flipped myself back over to develop branch and did the last update to 2.0.0.2527. Now everything is working again.

So long story long…is there a safe way to roll back to master once you’ve updated on the develop branch?

Not until the changes in develop are merged into master. The other option is to restore an older version of the database, from before the upgrade to develop.

Ah, next time I’ll think twice. Since you mentioned restore. Do you know if there’s an easy way to tell what version the backup was taken from? The only way I can see to do it now is to try and match the zip date/time stamp in the file name with the current logs files (if they go back that far) to see what version you were on when the backup was taken. It would be nice to see that in the zip file name or inside the zip itself.

I think a file in the zip makes sense, not sure about the file name, its already quite long and full of numbers. I’ve added it to Trello: https://trello.com/c/Y6KFtVlw/896-store-version-in-backup-zips