How do I revert a Git commit?

To revert a Git commit, you can use the git revert command. This command creates a new commit that undoes the changes made by a previous commit without altering the project history. Here’s how to do it:

Steps to Revert a Git Commit

Identify the Commit to Revert:
- First, you need to find the commit hash of the commit you want to revert. You can view the commit history using:
```
git log
```
This will display a list of commits along with their hashes.
Revert the Commit:
- Once you have the commit hash, use the git revert command followed by the commit hash:
```
git revert <commit_hash>
```
Replace <commit_hash> with the actual hash of the commit you want to revert.
Resolve Conflicts (if any):
- If the changes being reverted conflict with other changes in your branch, Git will prompt you to resolve these conflicts. You will need to manually edit the conflicting files, stage the resolved changes, and then complete the revert.
Complete the Revert:
- After resolving any conflicts, you can finalize the revert by committing the changes. If there were no conflicts, Git will automatically create a new commit for you with a default message indicating that it is a revert.

Example

Here’s a complete example of reverting a commit:

# View commit history to find the commit hash
git log

# Revert the specific commit
git revert 9fceb02

# If there are conflicts, resolve them, then stage and commit the changes
git add resolved_file.txt
git commit -m "Resolved conflicts after reverting commit 9fceb02"

Important Notes

Non-destructive: The git revert command is non-destructive, meaning it does not remove the commit from the history. Instead, it adds a new commit that undoes the changes.
Use for Public Commits: It’s safe to use git revert for commits that have already been pushed to a shared repository, as it maintains the commit history.

Alternative: `git reset`

If you want to remove a commit entirely (and you haven't pushed it yet), you can use git reset. However, this is more destructive and should be used with caution, especially in collaborative environments.

Summary

To revert a Git commit, use the git revert <commit_hash> command to create a new commit that undoes the changes. This method preserves the commit history and is safe for public branches.

Further Learning

To explore more about reverting commits and managing your Git history, consider checking out labs focused on:

Git Basics: Learn about commits, reverting, and managing changes.
Advanced Git Techniques: Understand how to handle complex scenarios in Git.

If you have any more questions or need further clarification, feel free to ask!