TFS merging shelveset with latest code changes

Tech-Archive recommends: Speed Up your PC by fixing your registry

using VS 2005 team edition and TFS....

I have shelved a number of code changes that i am ready to check in.
My "partner developer" has been checking changes in.
There doesn't seem to be any built in utility to merge or resolve
differences between shelved and checked-in code.

I could always determine the files he checked in with changes, pull my
shelve to my workspace and then compare and get latest on each of those
individual files.

Is this my only option? Are there other ways or tools to make this less
error prone?
Does anyone else use shelvesets and how do you manage this?

Comments in addition to answers are welcome.
--
kevin...
.