Git Revert a Revert for a Merge

git github merge git-revert
Serendipity picture Serendipity · Apr 5, 2017 · Viewed 18.9k times · Source

I had a feature branch created, let's say feature/branch1 on github. I created a pull request for it and got it merged. Initial PR Merge Commit

When it reached our pipeline, we figured there was a problem and we got it reverted using the Revert button on Git This created a "Revert" PR that we merged with the master and all was well. Reverted Merge Commit

After a few weeks, post other PRs that got merged into the master, we figured we would revert-the-revert. This time, we went into the Revert PR that was closed and tried to use the Revert button again. But we got this error message

Sorry, this pull request couldn't be reverted automatically. 
It may have already been reverted, or the content may have changed since it was merged.

How do I get this revert done?

The most ideal situation I would like to have, is to have a new branch that contains the revert of the revert, so I can make further changes and go back through the PR process.

Answer

max630 picture max630 · Apr 6, 2017

The error which you see is artificial check of github, which I personally find unneeded. You can revert the revert locally then:

git fetch origin master
git checkout origin/master (or reset)
git revert <REVERT HASH>
git push origin master

This should succeed, modulo conflicts with changes done since the revert.

PS: actually, the error could be because of the conflicts.

Related questions

Revert a merge commit from a protected branch on GitHub.com

We have protected our develop branch on GitHub so that nobody downstream can push their commit directly. The commits need to go through specific feature branch and get merged through a pull request. There came a scenario where a feature …

Read More
Reverting a pull request completely

Current master has been worked on for the past month. Also a branch called contract has been worked on simultaneously. contract was merged into master by mistake. 100 commits, with dates that overlap master commits that already existed. How can I …

Read More
Git pull a certain branch from GitHub

I have a project with multiple branches. I've been pushing them to GitHub, and now that someone else is working on the project I need to pull their branches from GitHub. It works fine in master. But say that someone …

Read More