Git - how to revert a merge

Question

I am using Intellij and Git.

I mistakenly merged our development branch into our autoapproval_hierarchy_ui branch and pushed it to the remote repo. Now I would like to revert that merge.

Please can someone advise how I can do so?

I would like to basically have it exactly like it was before I did the merge, i.e. at 2020/04/06 at 10:35 (ass you can see in the picture below).

This means it will no longer have the changes from the development branch in the autoapproval_hierarchy_ui branch on the remote repo.

I have tried to 'Reset Current Branch to Here...',

and this sets my local workspace in the desired state,

but I cannot seem to push that state to the remote repo.

If I do a:

Git -> Compare with Branch... -> autoapproval_hierarchy_ui

There are all the merge differences.

UPDATE

Based on the comments from jessehouwing below, I think I can do the following:

Answer 1

In your example, you have merged unwanted changes from development to autoapproval_hierarchy_ui

Problem:
I made a test environment where I merged 4 commits from dev to remote main My current Git Model. Now I want to revert dev changes from remote main!

Solution:
Go to your IntelliJ Idea:

1. Understand where dev branch collides with main. From my Git Model Examle Git Model example it is where I have a commit: Merge pull request #1 from dev
2. Make a left-click on that collision (now in the right bottom corner appeared a window)
3. Hover over the root directory option and make right-click Image of this step
4. Pick option: Revert Selected Changes
5. Pop-up window can appear Example of a pop-up window. Select OK
6. Now you have changes that will return main to the status before dev merge. Before dev merge.
7. Now push this changes to remote main with the next commands:

git add .
git commit -m "YOUR COMMIT MESSAGE"
git push origin main

YOUR COMMIT MESSAGE - For example: Reverted last merge

Now you can see that main branch got rid of unwanted changes from dev branch: Final result