Undo or Rollback a comitted merge

[Noble Bell]

It seems that I have really messed something up or just really don't understand what I am doing. I tried to do a merge and had some conflicts. I worked through all the conflicts and resolved the merge status on each then committed my change set. What is the easiest way for me to completely "rollback" the entire merge? When I go to history and look at the files the "rollback" feature is grayed out. Also, I noticed that my .csproj file was not going to be merged. Is this normal?

[lbauer]

You contacted us by phone -- I'll give you a call soon.