updating a branch from the trunk

[Noam Tamim <no...@gmail.com>]

Hi,

I have a branch, let's call it MyBranch. It was branched off the trunk at
revision 100. I did many code changes on that branch, and merged them into
the trunk at rev. 200 - resolving all conflicts in the process.

The trunk was updated, and now the HEAD is 300.

I now want to continue working on MyBranch. But first, I want it to be equal
to the current trunk.

Can I do this? Can I merge trunk 200:300 to MyBranch, while overwriting the
files in MyBranch (so that in the end the contents of both the trunk and the
branch are the same)?

Another option I thought of was to delete MyBranch, and recreate it from the
trunk. But I want the log messages to be kept in MyBranch...

Thanks,
Noam.