I have a master branch and a migration branch. We completely changed the codebase in the migration branch, and now we want to replace the master branch with the migration branch. Is there a proper way to do this?
I think merging is not an option, as I want to replace Master.
Also, the master branch is a protected branch, so I can’t directly force push in the master.
I tried merging, but I am getting lots of conflicts, which I don’t want to have as it is a replacement, not a merge.
Is there any proper way to deal with this situation?