TFS-更新最新版本后撤消合并

Question

I did a search on this issue and found a lot posts and questions but none seems to target my situation.
I had pending changes and i did "Get Latest", i got the conflicts window and wanted to resolve them, so i did a merge as i wanted to keep both my changes and the server's new code. but i forgot to check the block of codes and i just clicked merge (did not checked in yet!). i had a conflict on one of the cproj files and now i lost some .cs files as well.
I think i lost both versions of code and i want to go back and do that merge all over again and do it right, but i don't have a time machine! :)
Any help would be appreciated.

Answer 1

You basically did an... let's say "Auto Merge". The only help you have is to view the changeset/history of that exact file. Unless you shelved some changes, there is no way to get both .cs files back.

Answer 2

If you haven't checked in merged changes yet, you still have an option to compare merged files with latest server version and undo all those changes which got merged from server to your local changes manually(especially csproj file in your case). Later, you can be careful to merge again and select all the required blocks.