#Change Management

Hi

When trying to sync a class to the server where the server class has been updated by another user, I, as expected, get the Conflict Resolution Wizard.

I can then use the wizard to copy code from the server side to my local copy using the arrows also as expected.

But when I have integrated the remote code into what I think is my local copy how do I save it so that it gets integrated into my local copy and synchronised to the server.

I am wondering about upgrading our Healthshare mirrored environment to the latest release. Has anyone upgraded recently to what version and what kind of effort was put into it. I am thinking it will take 2 analysts full time for 3 months. Am I out of the ball park on this estimate? We have bout 600 operations, Processes and services. What are some of the benefits we get from upgrading and what are some of the problems you ran into during the upgrade? Any information you have to share would be greatly appreciated.
Thanks