Want to revert a commit, however, get error message from git

Receive the following error when I try to revert a commit:

git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=manager-st revert --no-edit cc158e3f4f17dd49ef0c75ecd7f9c449e52307f8


error: commit cc158e3f4f17dd49ef0c75ecd7f9c449e52307f8 is a merge but no -m option was given.

fatal: revert failed

 

The reason for this revert attempt is that I merged the wrong branch into the current branch.  So before the revert, I reset (In Source Tree) a few of the files back to their previous commit, and discarded all of the items from my working copy, however, this didn't cleanup history, so I tried reverting the commit, but received the above error.  

Is there a way that I can clean up the history or revert the changes back to what they were originally?

2 answers

This widget could not be displayed.

Hi

I'm afraid SourceTree fro Windows does not support the '-m' option for reverting a merge. You will need to run that manually form the Terminal, see https://git-scm.com/docs/git-revert

This widget could not be displayed.

I had to create a custom Action that then I was able to apply on a commit.  The action was Git revert -n -m 1 $SHA.  I was not able to get rid of the history though.  So I ended up creating a tag (using a new name) for the last good commit for that branch and pushed it.  This was Followed by creating a new branch off the branch I just tagged, and gave it a differnt name, and finally closed the original branch and started using the new branch.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

872 views 2 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you