Sometimes you make the mistake of committing to the wrong branch while working. Here’s how to resolve the situation when you should have created a new branch from develop but accidentally committed to branch-a.
Example Situation
branch-ais an existing branch with previous workdevelopis the base branch where you intended to start new work- You accidentally committed to
branch-a - You haven’t pushed with
git pushyet
Goal
- Move the current commit to a new branch based on
develop - Restore
branch-ato its state before the commit
Step-by-Step Procedure
1. Check Recent Commit Hash
git log --onelineCopy the hash value of the topmost commit.
Example: abc1234
2. Create New Branch from develop
git checkout develop
git checkout -b new-feature-branch3. Bring Commit to New Branch
git cherry-pick abc12344. Remove Commit from branch-a
git checkout branch-a
git reset --hard HEAD~1※ For multiple commits use HEAD~2 or HEAD~3 or use git rebase -i.
Work Summary
| Task | Command |
|---|---|
| Check commit hash | git log --oneline |
| Create new branch | git checkout -b new-feature-branch develop |
| Move commit | git cherry-pick <commit-hash> |
| Reset original branch | git reset --hard HEAD~1 |
Alternative Methods
Method 1: Create and Checkout Branch in One Command
git checkout -b new-feature-branch developMethod 2: Handle Multiple Commits at Once
# Cherry-pick multiple commits
git cherry-pick abc1234^..def5678
# Specify range
git cherry-pick abc1234~3..abc1234Method 3: Using Interactive Rebase
git checkout branch-a
git rebase -i HEAD~n # n is the number of commits to roll backImportant Notes
- This method can only be used safely before pushing
- If already pushed use methods like
git revertorreflogorreset --hard origin/branch