Merging branches up to latest trunk

Merging branches up to latest trunk


Hi,
I've tried myself to update the menu and grid branches to the latest
trunk (my eclipse-based svn client likes to merge all updates of
existing files on a content-base, asking me to manually edit conflicts
on a few hundred files...), pinged Richard about it (no pong). Soo,
can someone else tackle that, and post here how to do it? Once
positionTo is in trunk, it'll get interesting for most dev branches..
I wonder if that would work better via a SVN command line client -
does someone know of any for Windows?
Jörn