What should I do if I accidentally commit to the wrong branch in Git?

Jul 27, 2024#git257

AI Translation

This post is translated from Chinese into English through AI.View Original

AI-generated summary

To fix a mistake in a branch, first undo the last commit in the wrong branch and stash your changes. Then switch to the correct branch, apply the stashed changes, add and commit them. Another method is to use git cherry-pick to apply a specific commit from the wrong branch to the correct branch. Finally, delete the commit from the wrong branch.

First, undo the last commit on the wrong branch, then stash your changes:

git reset HEAD~ --soft
git stash

Switch to the correct branch, pop out your temporarily saved changes and recommit:

git checkout correct-branch
git stash pop
git add .
git commit -m "your message"

Another method#

The git cherry-pick command is used to apply a specific commit from another branch to the current branch.

So, we can apply the latest commit from the wrong branch to the correct branch:

git checkout correct-branch
git cherry-pick wrong-branch

Finally, delete this commit from the wrong branch:

git checkout wrong-branch
git reset HEAD~ --hard