git merge direction
Posted on 2011-10-05
I noticed that when I tried to merge my master branch to my report branch to "speed up merging later on", that I actually made my life more difficult. That I was pulling changes in other files that I had removed in my branch, that this new branch explicitly removed for its purpose.
So it's silly, but I'd like a confirmation from someone that there should never really be a need to pull the master branch into another branch really- if your workflow is only to ever release from the master branch....
To be more precise, I should be able to create as many branches I want and only ever merge them into the master branch when they're ready- no need to merge at any other time.