So I have a project which does not have any regression test or automated unit tests. We release every week. We use forking git flow which is basically everyone forks repo and pushes their changes in their specific fork.
From their fork devs push to develop branch which is pushed to pre-prod where tester tests it and then it goes to release. We do weekly releases.
Now sometimes there comes a case when two features are in pre-prod branch one feature is broken and needs to be reverted and other is a priority feature which is needed to be released today. Now what happens is for one feature their are usually 4-5 Merge Requests (including bug fixes) each containing 1-2 commits and sometimes it's hard to revert them.
So in this case what would be the best course of action? Is there a better git workflow more suitable for this scenario? Is there a better way to revert the code than manually reverting each commit? We use Gitlab.