TFS Compare in Eclipse (cannot be copied from left to right)

Question

I have a problem with TFS in Eclipse. It works fine, but when I try to register, and I received a notification that the file that I am sending has conflicts with the one stored on the server, I cannot copy the changes from left (local file) to right (server) in the window comparisons. I can only copy from right to left, and the options “Copy everything from left to right” and “copy the current change from left to right” are grayed out.

Am I missing something here?

Or maybe this is so: I am making changes on the left, and the left (local) version is marked. But if so, why is the commit button greyed at the beginning?

Lucas

Answer 1

No, you cannot make changes to the server version, you can only make changes to your local version. The server version (right side) is just an idea that the server is contrary to your version of the location. You can take some of these changes from the server by copying from right to left, which will update your local file, and you can check it. But the server version is in an unchangeable set of changes, you need to check your changes to update.

You make changes on the left, but your left (local) file is not yet . You must resolve conflicts with the server version before this happens, which will include either support for these server changes or their adoption.

The commit button (marked disappointingly because it does not actually commit your changes to the server - it is indeed the “Save local content” button, but we cannot redefine the shortcut) will not be available until you make any changes to the left (local) side, since failed to save anything.

Sorry for the confusion. Remember that you can customize external comparison and merge tools for use in conflict resolution. I find the standard 3D left / right / right merge window to be more intuitive than the three-way merge of Eclipse. But it is very important.