Keywords: Git | Bitbucket | Revert Merge
Abstract: This article provides an in-depth analysis of two primary methods for reverting a merged pull request on Bitbucket: executing revert operations via Git command line or SourceTree tools, and utilizing Bitbucket's graphical interface features. Based on a real-world case where a branch was incorrectly merged into master instead of dev, it outlines complete steps from identifying the merge commit SHA to performing the revert. The article compares the pros and cons of manual Git operations versus built-in platform functionalities, emphasizing the importance of maintaining a clean codebase in team collaborations. It covers the principles of the Git revert command, SourceTree operation guides, and updates to Bitbucket's interface features, offering comprehensive solutions for developers.
Problem Background and Scenario Analysis
In the collaborative workflow of the distributed version control system Git, pull requests serve as a core mechanism for code review and merging. However, in practice, developers may inadvertently merge a pull request into the wrong target branch, such as code intended for the dev branch being merged into master. This scenario is particularly common in fast-paced development environments and requires prompt and correct handling to avoid compromising the stability of the main branch.
Basic Principles of Reverting Merges in Git
Git provides the revert command to handle committed changes, especially for merge commits. Unlike the reset command, revert creates a new commit that undoes the changes from a specified commit, preserving history and avoiding rewriting of public branches. For merge commits, the -m option must be used to specify the parent number (typically 1 for the main branch direction) to correctly identify the revert path.
Manual Revert Steps: Command Line and SourceTree Operations
First, ensure the working copy is clean, with no uncommitted or unpushed changes. Follow these steps to locate and revert the merge commit:
- Switch to the target branch (e.g.,
master) and pull the latest changes:git checkout master && git pull. - Use
git logto find the SHA-1 hash of the merge commit. In the example, the merge commit isbe36f72. - Execute the revert command:
git revert -m 1 be36f72. This command creates a new commit that reverses the changes introduced by the merge. - Push the changes to the remote repository:
git push.
In SourceTree, the process is similar: first checkout the branch and pull, then right-click the merge commit in the log window, select "Copy SHA-1 to Clipboard," and execute the above Git commands via "Actions → Open in Terminal." Note that SourceTree currently lacks a direct right-click revert feature for merges, but related feature requests are in development.
Bitbucket Platform Feature Supplement
With platform updates, Bitbucket has introduced a graphical revert feature. On the pull request page, clicking the "Revert" button automatically creates a new branch containing a commit that reverses the changes from the original pull request. Developers must then create a new pull request from this branch and merge it to complete the revert process. This method simplifies operations but may not suit all scenarios, such as those requiring complex conflict resolution.
Case Application and Considerations
For the case where a user incorrectly merged the create-alias branch into master instead of dev, after the revert operation, the master branch will return to its pre-merge state, while the create-alias branch can continue development based on dev. Key points include: confirming the SHA of the merge commit, using the -m 1 option for merge commits, and promptly pushing changes to ensure team synchronization. In collaborative environments, it is advisable to notify team members after a revert to avoid code conflicts or duplicate work.
Conclusion and Best Practices
Reverting a merged pull request is a common need in Git collaboration, and developers can choose between manual Git operations or built-in platform features based on the situation. Manual operations offer finer control, suitable for complex scenarios, while platform features enhance usability. Regardless of the method, best practices in version control should be followed: maintaining clear commit history, promptly addressing incorrect merges, and leveraging tools like SourceTree for assistance. As Bitbucket and SourceTree features evolve, the revert process is expected to become further simplified in the future.