如何恢复 azure devops/visual studio/git 中的合并分支

Question

I have merged a feature branch into develop and now need to revert this merge. In Azure devops when I did the pull request I couldn't see any option to squash commits (new to azure devops) and so the develop branch history looks like this..

So the point at which I merged the branch is 61575 but it includes all the commits on the branch. I need to revert all of the merged branch and all those commits so that the develop branch is showing as commit 0063d782. How would I do that please?

Many thanks for any help

Answer 1

To "unmerge" the branch, you need to reset develop to the last commit. However, by doing so you rewrite git history, so please be careful. Please make sure that no one has already pulled the merge commit you are going to remove.

If I understood correctly, your initial situation is:

In my example master points to 6146480 , which is the merge commit. In order to remove the merge commit i need to hard reset to 82185bd , which is effectively the commit before the merge commit.

I can do this by executing git reset --hard HEAD~1 on the master (or develop in your specific case) branch.

By doing so the commit graph looks like this:

All you need to do now, is to push (you might need to force push) your changes to remote.