[Newbie alert] Question about keeping a branch up-to-date with the trunk

I'm working solo right now, but am also working on a major site redesign (on
a branch) while I complete smaller items (on the trunk) in the interim. I
use the trunk for the smaller items, as my plan is to always have the trunk
reflect the "live" application. In the future, of course, I intent to merge
the work on the branch to the trunk and then release it to the "live"
application.

However, despite having read over the O'Reilly book on Subversion and read
other comments as well, I admit to not grasping exactly how I am going to
keep my branch up-to-date with what is going on in the trunk. I've seen use
cases for the opposite, but just want to make sure I do it the right way.

Basically, I'm hoping to merge the changes from the trunk out to the branch
on a quasi-regular basis, so that I don't get too out-of-date.

How do I determine what changes exist on the trunk that I need to merge out
and how would I go about requesting that merge. I presume it's done via an
update, but I'm not entirely clear how to tell the branch that it needs to
pull out the latest changes from the trunk.

Thanks in advance,
Andy
Received on Wed Oct 12 18:33:51 2005