Merge conflict while trying to deploy

Hi! I’m trying to deploy my app, but ran into a frustrating issue. I made a lot of changes over the last 3 days, so that now I get a this error:

The problem, is that no matter how I merge, this overwrites a ton of the changes I made, which is furstrating. Is there an equivalent to “git push --force” so that I can deploy the current development version? Or maybe is it possible to remove the live version and then deploy the dev version?

Thank you very much.

This topic was automatically closed after 70 days. New replies are no longer allowed.