How to properly merge a branch with a fix after reverting it?

Question

git

There is a develop branch and a feature branch on gitlab. Made a merge request in develop, merged it. Found a problem. We did a revert merge, rolled back. In the commit history of the develop branch, everything naturally remains (commits from feature and then revert them).
Fixed a bug in feature. Got a question. How to properly resolve conflicts and merge a feature in develop?
I tried rebase, but no matter how I tried to resolve conflicts, I ended up with "changes" that were clearly different from the current state of the feature.
Please help with good advice. I do not have enough experience in working with git, and have not come across this.

Answer 1

How to properly resolve conflicts and merge a feature in develop?

Just like the first time. Those. just die and that's it.