I screwed something up with my whole team by modify a file that someone else modified and tried merging it into the same commit that they had a very stupid mistake and now I have no idea how to remove/revert it, i have tried revert commit but returns an error as seen in the photo below. I have tried doing a hard reset to a stable commit but it doesn't delete the ones ahead of it like people in other questions said. But now this broken version is on the remote branch with Bitbucket so people can't push anything till they have pulled which we obviously don't want because the stuff they pull is broken.
See photo for a better explaination i really have no idea how to explain this first time using version control and it was going so well till now...
commit eed6fba is what i want to revert back to. commit 0ed8b84 needs to be removed.
You'll have to go to the command line for this.
From Marcus Ericsson's answer: http://stackoverflow.com/a/1973304/1476926
To revert a merge commit, you need to use: git revert -m . So for example, to revert the recent most merge commit using the parent with number 1 you would use:
git revert -m 1 HEAD
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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