I made quite few changes in my project (I was working on a remote branch and not the master), I committed them and created a pull request on BitBucket and merged the branch to master. I had forgotten to push my changes after the commit. Now, after trying switching the current branch to my remote branch and reverting to the commit before the merge, I managed to get all my changes back and back them up elsewhere in my system. What I want to do now is undo the bad merge that I did. Each time I click on the merge and select "Reverse commit", I get the following error message:
"error: Commit <commit_id> is a merge but no -m option was given.
fatal: revert failed"
I want to basically remove the merge and bring it to a state such that it doesn't say master(4 behind) anymore.
I am new to source control and I would appreciate it if anyone could help me out with this.
Instead of reversing the commit, you want to reset the target branch (master, it sounds like) to the commit before the merge. To do this in SourceTree, right click the commit before the merge, and choose "Reset to this commit". You probably want to do a hard reset, which will reset your working copy to that commit as well, but make sure you don't have any changes you want to keep, or you'll lose them.
Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going. The ...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events