sourcetree 取消commit

Sushi Authors

3 min read

·

09-12-2024

29

0

Share

This article will guide you through various methods to undo a commit in Sourcetree, a popular Git GUI client. Whether you made a small typo or committed sensitive information, understanding how to revert your changes is crucial. We'll cover several scenarios and provide step-by-step instructions. Remember to always back up your work before attempting any significant Git operations.

Understanding Commits and Reverts in Git

Before diving into the methods, let's briefly review what a commit is and how Git handles reverts. A commit is a snapshot of your project's state at a specific point in time. Each commit has a unique identifier (SHA hash). Reverting a commit essentially creates a new commit that undoes the changes introduced by the previous one. This keeps your history intact, unlike directly modifying past commits, which is generally discouraged.

Methods to Undo a Commit in Sourcetree

The best approach to undoing a commit depends on whether the commit has already been pushed to a remote repository.

Method 1: Undoing a Local Commit (Not Pushed)

If your commit hasn't been pushed to a remote repository (like GitHub, GitLab, or Bitbucket), you have several options:

1. Using Sourcetree's "Reset" Feature:

This is the simplest method for local commits.

• Step 1: In Sourcetree, locate the commit you want to undo.
• Step 2: Right-click on the commit and select "Reset...".
• Step 3: Choose one of the following options:
  • "Soft Reset": This undoes the commit, but keeps the changes staged. You can then amend or redo the commit.
  • "Mixed Reset": This undoes the commit and unstages the changes. They remain in your working directory.
  • "Hard Reset": This undoes the commit and discards the changes entirely. Use this with extreme caution.
• Step 4: Click "Reset" to confirm.

2. Using the "Amend" Feature (for the most recent commit):

If you need to slightly modify your latest commit, "Amend" is ideal:

• Step 1: Stage your changes (or unstage them to remove unwanted changes).
• Step 2: Right-click on the last commit and select "Amend...".
• Step 3: Sourcetree will open the commit message. You can edit it and make the necessary changes.
• Step 4: Click "Commit" to replace the old commit with the amended version.

Method 2: Undoing a Pushed Commit

Undoing a pushed commit is more complex and requires a different approach. Directly altering past commits in a shared repository can cause conflicts.

1. Using "Revert":

This is the safest and recommended method for undoing pushed commits.

• Step 1: In Sourcetree, right-click on the commit you want to undo.
• Step 2: Select "Revert...".
• Step 3: Sourcetree will create a new commit that undoes the changes from the selected commit.
• Step 4: Review the changes and commit the revert. Be sure to write a clear commit message indicating that this is a revert. This creates a clean history and avoids confusion.

2. Using "Reset" (Advanced and risky):

Resetting a pushed commit is generally not recommended unless you are very familiar with Git and understand the implications. It can cause problems for collaborators if they have based their work on the commit you're trying to remove. Proceed with extreme caution.

If you still decide to use this method, follow the same steps as Method 1, but be prepared to resolve potential conflicts with your collaborators.

Troubleshooting and Best Practices

• Always make backups: Before performing any Git operation that modifies history, create a backup of your repository.
• Understand the implications of each method: Choose the method that best suits your situation and understand the potential consequences.
• Communicate with your team: If you are working on a shared repository, communicate with your team before undoing a pushed commit.
• Use clear and informative commit messages: This makes it easier to track changes and understand the history of your project.

By following these instructions, you can effectively undo commits in Sourcetree, maintaining a clean and manageable Git history. Remember to prioritize safety and communicate clearly with collaborators, especially when dealing with shared repositories.