Reverting push to remote with sourcetree

问题:

I accidently pushed a feature branch to the remote master. Now I want to revert the master to the previous commit. When I select 'Revert current branch to this commit' only the local branch is reverted, and because the remote master is 55 ahead (accidental push) I cannot push the just reverted local master to the remote.

When looking into this issue on SO and Google, I found that many people use force push using the command line. But since I'm using Source Tree I'd like to come up with a way that actually uses Source Tree.

I also found the rebase option, but I can't seem to find a step-by-step tutorial..

Any ideas?

回答1:

When you push a commit, the safest way to revert it (rather than forcing the push with -f) is to use the revert function, so a new commit is created on top of your previous commit.

This is possible to do using Sourcetree, right clicking in the commit that you want to revert, and selecting "Reverse commit...".

You would need to do this for each commit you want to revert, in reverse order.

回答2:

The best way to do this is with Reset <branch> to this commit option shown in the image below.

A pop up will be displayed to you to choose what mode of code reset you would like to choose. [See below]

Note: This is not exactly code reversal, but it removes your commit entirely from the local and makes it look cleaner.

回答3:

Sourcetree doesn't expose the -f flag to you: https://answers.atlassian.com/questions/54469/how-do-i-perform-a-forced-push-push-f-from-sourcetree

So, the only way to bring the remote back to it's original state is to git revert each commit you introduced in the reverse order.

Assuming the remote was on commit A and you pushed your feature branch holding commits B, C and D, you have to

git revert D
git revert C
git revert B
git push

The push will work fine since you're not modifying the pushed history but instead push a new set of changes.

If you want to shorten your series of reverts to one commit, you could do a

git rebase -i origin/master

and select each of your revert commits to be squashed. Then, your push will only contain one commit that reverts D, C and B in one go.