David: You make an excellent point there. I usually merge trunk changes out to my branch if the branch is out for a while, I was more focussing on the act of getting branch changes into trunk. I agree though, having the branch already including as many trunk changes as possible is a very good recommendation! Doing more than just branching and then a single merge back is what makes me nervous about the merge-reintegrate flag although I’m open to being told it does actually work.