Merging from Main to Dev

Get a conflict on file A

Click on resolve conflict

Dialog says building change summary

Processor is shoots to 50% usage, fan kicks in and it never comes back.

Let it run for 8 hours(over night) and it never came back. I have reduced the merge to just this one file and it will not return from resolve conflict.

You can hit cancel and the dialog goes away but it never recovers from eating half of the processor. You basically have to kill VS.

I can't really install the beta here in production. I am glad to hear that it is fixed. Do guys have a gut feel for when you plan to ship golden bits?

Oops, looks like I may have jumped the gun. This is the VS SP1 beta and not the TFS SP1 beta. I'll give it a try.

Yup, that did the trick.

Thanks,