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.

  • SourceTree keeps asking for Github password
  • GIT: change commit date to author date
  • .gitignore file in Sourcetree not working
  • How do I configure Visual Studio 2013 for use with Git/SourceTree
  • Why cannot a feature be finished with unstaged changes?
  • What is the difference between Stop Tracking and Discard File in git SourceTree
  • I also found the rebase option, but I can’t seem to find a step-by-step tutorial..

    Any ideas?

  • Can't push Git change - Change-ID not found
  • Extract git subdirectory while keeping history WITH renames
  • How to reset sourcetree settings/preferences
  • My command line locks up when making a commit with GIT
  • File after adding to global git file is still visible
  • git How to merge a branch into the master branch by completely overwriting master branch
  • 2 Solutions collect form web for “Reverting push to remote with sourcetree”

    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…”.

    enter image description here

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

    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.

    Git Baby is a git and github fan, let's start git clone.