Diff from inside Visual Studio 2003

[shaileshdwivedi]

We have multiple checkouts allowed in our repository. The last to check-in file gets the notification in the Visual Studio that the file needs merge. There are 3 button available in the same alert window. Diff, Merge and Resolve Merge Status. When the developer selected "Diff", the diff screen has Left Panel and Right Panel marked as read only. He can not move around the changes in the Diff screen. (He removed the Read Only atribute from the files in the physical location in the machine But of no use either.). If he goes with the Merge button then a Auto Merge is run by default, though he has turned-off the "Auto Merge" option in his vault client Tools > Options settings. "Resolve Merge Status" button been enable all the time in this alert window, If he clicks that button the curent chnages gets overwritten to the repository.

We need to understand what should be the best approach to resolve the merge in above scenario? Also, Is there any way to disable "Resolve Merge Status" button in this notification unless user has atleast visited Diff or Merge screen (no matter if he made changes or not but he did review the conflict by visiting Diff screen).

[Beth]

Here is how you can alter the read only attributes: http://support.sourcegear.com/viewtopic.php?t=2670