Use git reset HEAD~1 to reset back before your wrong-branch commit.Switch back to your original branch using git checkout again.Type git cherry-pick, substituting the SHA from above.Use git checkout to checkout the branch you want to move the commit to.Use git log to show the commit logs, and copy the SHA of the commit you want to move.What if I have committed my changes to another branch?Īnother answer on the same Stack Overvflow thread, provides a solution for if you have already committed your changes to a branch. In the answer’s comments you’ll see that some argue this is unecessary given that the git checkout alone should suffice, however it appealed to others who viewed the approach offered greater neatness/control. Unlike pop, may be any commit that looks like a commit created by stash push or stash create. When no is given, is assumed, otherwise must be a reference of the form Like pop, but do not remove the state from the stash list. Pop: Remove a single stashed state from the stash list and apply it on top of the current working tree state. The definition given in the git documentation for each is: Note, the solution uses git stash pop, rather than git stash apply. Therefore, if you want to move your changes to an alternative branch that already exists, all you need to do is run: If you haven’t already committed your changes, just use git checkout to move to the new branch and then commit them normally - changes to files are not tied to a particular branch until you commit them. Multiple questions have been raised on Stack Overflow relating to this (examples can be found here, here and here) Visual Studio will detect the changes (including if the checked out branch is changed), and may ask you to reload your solution. If you experience this issue, I’d advise bypassing Visual Studio and executing git commands directly from the command line. Note: The reason I was looking for a solution is because Visual Studio can be a bit funny about allowing you to switch branches if there are outstanding changes often instructing users to either commit or revert their changes before switching.
How do you move those changes to the correct branch?
Git switch branch without committing code#
A common scenario: you’ve been working away on some code changes, but then realise that you have the wrong branch checked out! Or, perhaps the code changes have reached such a scope that they really deserve to be in their own branch.
0 kommentar(er)
