Ideal way to revert a PR from main branch

[Manikanta532]

PR Revert issue
Question

Body

We had a PR from feature to main branch. which we want to revert it. used the option of revert button on GitHub, it created new revert branch and raised the PR to main. By doing this we were able to revert the code whatever that is added to main branch but, still commits are present in the main history.
Issue here is when I try to merge develop to main should have some x file changes, now not showing them at all.

Should we revert all the commit from main branch history or is there any better way to handle this?

I saw the approach of revert the revert commit, which I did not get exactly how it's going to remove commits.

[alexisseurin]

Git command used to reset the current branch to a previous commit: git reset --hard commit_hash

Command to view the commit history (with the commit hash) of the current branch: git log --oneline

[Manikanta532]

Hi Alex,

I tried it out on a feature branch, am able to clear the older commits, but how to merge this to main, when I raise PR from feature to main.
It does not show anything.

I tried changing a file in the feature, if I merge that to main will it clear all those commits which were reset in feature on the main as well ?
Could you suggest on this please?

[alexisseurin]

If you reset commits and then force push (git push -f) to the feature branch, the history of the feature branch will be rewritten. When you merge this rewritten history into the main branch, the merge will proceed as usual, but the commits that were reset will not be reintroduced to the feature branch. However, this does not affect the main branch unless those commits were already present in the main branch.

You can try these commands:
git merge feature-branch
git push origin main --force

[Manikanta532]

Once reset is applied on feature, I did force Push to head of that feature.

Steps followed

1. git reset --hard hashcommit

2. result : Head is now at xxx.

3. git status
   On branch xx
   You branch is behind origin/xx by 5 commits.
   Nothing to commit.

4. Git push origin HEAD --force
   Head to feature-xx force updated.

After thay When I check the history of my featute it's pretty clean like before.

Our main is a protected branch it needs a PR to be raised , I did raise it but it's not showing anything to be merged to Main. As the cleaned commits are already Present in the Main.

Anything am I missing here ?

[alexisseurin]

If these commits are already present in the main branch, there are no new changes to merge, which is why the PR shows no changes.

[Manikanta532]

When we perform a revert on guthub on the ui for a PR it did revert the code but it has the commits on that branch but no code exists that is causing issue.