如何撤消 git commit 和 push、reset 以合并

Question

Here is my current situation. I merged a branch into my live branch and pushed it to the remote repository. But, there was an issue with code on that branch. I want to revert this live back to a previous commit which happens to be another merge into the live branch. How would I do this?

I don't quite understand the difference between git revert reset and rebase , and am not sure which of any of these is appropriate in this case.

Answer 1

don't quite understand the difference between git revert reset and rebase

Well you could use any of them. But because you already pushed, using revert is the only "nice" way of doing it if you have other people working on the same repo.

As for how to apply the revert:

git revert -m 1 <merge commit hash>

Note you need the -m option because, merge commits are essentially commits with pointers to 2 parent commits and:

"Usually you cannot revert a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows revert to reverse the change relative to the specified parent."

https://git-scm.com/docs/git-revert#Documentation/git-revert.txt

Answer 2

to revert a change you made, you can use git-revert

you can use revert like this:

git revert -m 1

the number 1 represent the number of commits you want to revert.