hmm, this is what have been bugging me. That is the workflow I'm used to
from git but I got the feeling that I should NEVER merge trunk into one
of my feature branches because that would mess up earlier revisions later on in trunk (not sure how though). I
will have to set up a new project locally and try it out for myself, that's the best way to learn =)
I don't like to work out of trunk, always branch to a bugfix branch or feature branch. As a response to the checkout/branch difference, yes got that one (I'll stay away from checkouts).