Jordi Jordi - 2 months ago 23
Git Question

Revert a merged pull request on BitBucket

I've created a pull request and I've merged it to an wrong branch. How can I revert it?

As far I've been to figuring out taking a look over there, I'm able to hard reset the destination branch... but, how about the pull request in

origin
repository?

I'm using BitBucket and I've created the pull request from SourceTree (opening the bitbucket page).

I've three branches I'm working on:
master
,
dev
and
create-alias
.
create-alias
was set up from
dev
and
dev
from
master
:
master -> dev -> create-alias
. The problem is I made a pull request from
create-alias
and I did merge it into
master
instead of
dev
.

I'm working on
create-alias
branch right now. The last commit on
create-alias
is
6ee20f9
and the merged commit on
master
is
be36f72
.

Could you write me down a bit about who to step-by-step revert it?

As far I've been able to figure out:


  1. checkout on
    master
    .

  2. revert -m 1
    6ee20f9
    .

  3. push.

  4. checkout on
    create-alias
    and going on working.



Isn't it?

Answer

Unfortunately, there is no "Revert Pull Request" feature on BitBucket as of this writing, but a feature request exists for it.

Note: Before you proceed, make sure your working copy is clean, with no uncommitted or unpushed changes.

So, you'll have to revert the merge in Git. First, find the SHA hash of the merge commit.

On the command line, this is:

git checkout <branch>
git pull
git log

Then, we revert the merge commit and push it:

git revert -m 1 <SHA-1>
git push

In SourceTree, first checkout the branch in question, then Pull. Find the merge commit in the log window, then right click it, and click Copy SHA-1 to Clipboard.... Then go to Actions --> Open in Terminal. Once the terminal opens, type:

git revert -m 1 <SHA-1 (from clipboard)>
git push

Unfortunately, SourceTree doesn't have a way to simply right-click and revert a merge, but a feature request exists for it.