Issue with Merging branches due to migration history purge in beginning
Hello guys! Going to describe the issue Im experiencing the best i can.
For context, this is all vibe coded and I am not a dev by trade
I had a project i built out on lovable + supabase. I then had to hand this off to some developers who implemented some features, which required me to switch off of lovable and instead fo Cursor + using more normal git workflow with github and the same Supabase
At the time, i wanted to create a branch of my supabase that i could work on without fear or breaking the production supabase, so I went through a very long process of trying to create a branch that was an "Exact duplicate" of the production branch
The only way i ended up doing this was clearing the entire migration history of that prod branch, creating a migration named "remote_schema.sql" that was pretty much a full dump of the entire schema of prod. After this, i was able to successfully create the preview branch as an exact clone of the prod branch and continued work from there
NOW, i am at the point where this has come back to bite me in the ass, as no matter what I try i am unable to get the new preview branch merged into the production branch. Im pretty confident this is due to me purging the production supabase migration history to create the new branch as an exact duplicate of prodution branch. I am essentially in an endless loop of merge conflicts that im under the impression will not be solved due to the core issue here
Wanted to see if anyone has ideas of what to do here. I am fully down to just completely scrap the prod branch and replace it with the preview branch (no important data in there), but i am not too sure if theres a way to do that. I also know that its not good practice on supabase to use the preview branch as your prod database as well
Any help here would be greatly appreciated!!
For context, this is all vibe coded and I am not a dev by trade
I had a project i built out on lovable + supabase. I then had to hand this off to some developers who implemented some features, which required me to switch off of lovable and instead fo Cursor + using more normal git workflow with github and the same Supabase
At the time, i wanted to create a branch of my supabase that i could work on without fear or breaking the production supabase, so I went through a very long process of trying to create a branch that was an "Exact duplicate" of the production branch
The only way i ended up doing this was clearing the entire migration history of that prod branch, creating a migration named "remote_schema.sql" that was pretty much a full dump of the entire schema of prod. After this, i was able to successfully create the preview branch as an exact clone of the prod branch and continued work from there
NOW, i am at the point where this has come back to bite me in the ass, as no matter what I try i am unable to get the new preview branch merged into the production branch. Im pretty confident this is due to me purging the production supabase migration history to create the new branch as an exact duplicate of prodution branch. I am essentially in an endless loop of merge conflicts that im under the impression will not be solved due to the core issue here
Wanted to see if anyone has ideas of what to do here. I am fully down to just completely scrap the prod branch and replace it with the preview branch (no important data in there), but i am not too sure if theres a way to do that. I also know that its not good practice on supabase to use the preview branch as your prod database as well
Any help here would be greatly appreciated!!
