How can I undo pushed commits using git?

When working with Git, reverting commits that have already been pushed to a remote repository can be done in various ways, depending on your specific objective. Below, I will outline two common scenarios and their respective approaches:

1. Using git revert

If you need to revert a specific commit and want the reversion to be visible to other team members, the safest approach is to use the git revert command. This command creates a new commit that reverses the changes of the previous commit. The advantage is that it does not alter the project history, making it suitable for public or shared branches.

Example:

Assume you want to revert a commit that has been pushed to the main branch, with commit hash abc123.

First, you can use the following command to 'revert' this commit:

bash
 git revert abc123

After executing this command, Git will create a new commit that reverses the changes of abc123. Then you can push this change to the remote repository:

bash
 git push origin master

This safely reverts the commit in the remote repository without affecting others' work.

2. Using git reset

If you need to completely remove a commit from history, you can use the git reset command followed by a force push. However, this method is riskier than git revert because it modifies the project history. In team projects, this can cause issues for other team members. It should only be used when absolutely necessary, and all team members should be informed of what occurred.

Example:

Assume you want to delete the last three commits, and you have confirmed that colleagues know you are performing this action.

First, you can use the following command to reset your local branch to the desired state (e.g., resetting three commits):

bash
 git reset --hard HEAD~3

Then, you can use the following command to force push to the remote repository:

bash
 git push origin master --force

This updates the remote repository state to match your local state, but it alters the repository history, which may cause issues for other collaborators.

Conclusion

In summary, avoid using git reset and --force pushes unless absolutely necessary. On the other hand, git revert is a safer and more transparent method that reverts commits without altering the repository history. In team collaboration, transparency and communication are essential.