You have to commit your changes in the branch before checking out to the master. So the solution is to checkout back to the branch, commit the changes, and checkout to master afterwards.
Long story:
I started implementing multiprocessing. Naturally, I didn't want to mess up my code, so I created a new branch 'multiprocessing':
git checkout -b multiprocessingSome hours of biting my nails later, I had it running, and even saw some improvement in speed. I also learned, that implementing multiprocessing in python is easy, but finding the right tasks that can be processed in parallel with speed improvement is hard.
Anyway, the code I wrote was far from clean, but my curiosity was satisfied for now. I decided to put that project aside and get back to it later.
So I checked out to my master:
git checkout masterWhen I ran the tool later, I realized that it started working on multiple cores. Had I forgotten to checkout? So I had a look:
git branchand it confirmed that I had correctly checked out:
joker@joker-Ultrabook:~/VCF2AFAnalysis$ git branch
* master
multiprocessing
plot_labels
Still, the code was the one I wrote while checked out to multiprocessing.
So I checked out back to multiprocessing:
git checkout multiprocessingand commited the changes
git commit -am 'started implementing mp'After checking out to master everything was alright.
I don't know why git doesn't tell you that you always have to commit your changes before checkout, but well, that's just how he wants it.
Keine Kommentare:
Kommentar veröffentlichen