So it's a good idea to inspect the results carefully before you assume that the stash applied cleanly, even if Git itself did not detect any merge conflicts. This means you can get "merge conflicts" if the branch you were working on by mistake, is sufficiently different from the branch you meant to be working on. The apply step does a merge of the stashed changes, using Git's powerful underlying merge machinery, the same kind of thing it uses when you do branch merges. (They're still in the repository, and can sometimes be retrieved in an emergency, but for most purposes, you should consider them gone at that point.) This deletes the reference to the weird non-branch-y commits. If all goes well, and you like the results, you should then git stash drop the stash. Switch branches, then "apply" the stash: $ git checkout develop The commits it makes are not "on" anyīranch but are now safely stored in the repository, so you can now
#Git create new branch and move changes code
This commits your code (yes, it really does make some commits) usingĪ weird non-branch-y method. Run git stash save or git stash push, 1 or just plain git stash which is short for save / push: $ git stash The easiest is probably git stash (as all the other answer-ers If not ( error: Your local changes to the following files would be overwritten. Now you can commit and the new stuff is all on develop. This creates a new develop branch starting from wherever you are If you don't have a develop yet, the method is trivial: $ git checkout -b develop
So now you want these changes, which you have not yet committed to master, to be on develop. return, edit a bunch of stuff, then: oops, wanted to be on develop Let's take a classic mistake: $ git checkout master There are a bunch of different ways depending on how far along you are and which branch(es) you want them on.
0 kommentar(er)
