Myself and 2 other developers have been working on code on our develop2 branch for a few months. We have had many commits, pull requests and merges into this branch.
Periodically, we have done a merge from develop 2 into our main develop branch, this is the branch before master.

However, a high priority issue then came in which needed to go to production before these changes. As a result, we had to remove our code changes from the develop branch. This resulted in reverting 4 separate pull requests.

Bare in mind these 4 pull requests had many changes bundled inside them as we only did the merge to develop every so often. There were in total over 30 files changed.

Now the time has come to re-deploy our changes back to develop, but when we create a pull request from develop 2 – develop, none of the previously reverted changes are being picked up.

I have tried to ‘revert the reverts’ but since some of the same classes got changed with the high priority issue, it won’t allow me to do this.

My question is how can we fix this?

Reverting the reverts is not an option
Cherry picking commits is not an option as there are tonnes of commits and code, it is too messy.

I see our only option being to manually copy all the changes into a feature branch off develop and then merge it in.

Is there some way i can over ride the develop branch with the code that is now on develop2? (The high priority changes have already been merged into develop2) Ultimately I need the 2 branches to be identical now with the code that is on develop2.

Please help 🙁