So I made a booboo and already pushed a merge commit.
The merged branch had a few commits that where not ready for develop.
After reverting the merge one commit needed to be reapplied.
But a merge wont work, because it already is merged (and reverted).
What you can do is a cherry pick.
How I created the problem
git merge branch git push origin develop
Here there was no way back, accept rebasing but that’s also not very easy.
How I solved it.
git revert eaf8c471 -m2 git cherry-pick fa9a6b0
Cherry pick just straight up applies the changes made in the files.
Where a merge applies the git changes.
Keep in mind this will only help if you need a handfull of commits reapplied. Otherwise you will need to find an otherway.
Or cherry pick a lot…