Rob Dennett wrote:I renamed a file and another developer made some changes to the file under the original name. I had him rename his version to the name I am using, but now when I view the file in the compare editor, I see that the entire file is in conflict and mark as merged, update, commit, and override and update are all grayed out. Does anyone know how to resolve this?
Thanks,
Rob
FYI, I learned that the thing to do was to move the file in question out of Eclipse, update it with the one in the repository and overwrite the contents with the one I saved out (I had already updated the file with the changes).