+1  A: 

The easiest way is to exploit VS 2008's "online" feature. Basically you want to set your solution offline, then bring it online while connected to the proper Codeplex server. TFS should figure out the rest.

Richard Berg
Thanks! Both your and Mehment's Answer are really helpful. I've accepted yours because that was what I just did to solve the conflict :)
Michael Stum
A: 

I don't think there is an easy fix... What I've done in the past is back up those files that I have edited, then do a "Get Latest Version..." for the files I edited. This should change the files back to being read-only etc... Now, check out the files the regular way and paste the backups you had into the checked out files. Obviously this really only works when there are a couple of files you have edited.

Polaris878
Get will not make files read-only unless you select the /overwrite option. Of course, this will also wipe out your changes. If you leave the default option, you'll have a writable file conflict which can be resolved "checkout and auto merge." This does work, it's just slow...and it doesn't pick up files that have been added or deleted. (or renamed, but that's an impossible task not even tfpt attempts)
Richard Berg
Yeah, I just overwrite most of the time (hence the backing up that I mentioned) but you are right there is a better way.
Polaris878
+1  A: 

To compare local and server folders, you can check out TFS Power Tool. After installing it, you can bring up the source control explorer, right click on the server folder and then select 'Compare'. Folder difference window will display the differences. You can also right click on the differences to see available commands such as 'Get Latest' to update your local folder for example. Check out Bryan Harry's blog post on the power tool

Mehmet Aras