resolving merge links issue (4.0)

[leeh]

A coworker of mine was working in a more traditional style, just editing and checking in on the main branch, and when he went to check in (using 4.0) he was out of date, so the system created a merge link for him to merge with. he selected to merge, and it all looked fine, but the merge link somehow didn't fully resolve and then he couldn't check in. Should this be the case? after that he wanted to resolve the merge link, and tried right clicking on it in the pending changes view, but had no options. It seems like there should be a way to interact with anything that shows up in the pending changes view. He eventually figured out that he needed to goto the branch explorer and explicitly merge from there, but having to do this seems pretty counter-intuitive. Are we missing something here with this process?

Thanks,

Lee