• Post Reply Bookmark Topic Watch Topic
  • New Topic
programming forums Java Mobile Certification Databases Caching Books Engineering Micro Controllers OS Languages Paradigms IDEs Build Tools Frameworks Application Servers Open Source This Site Careers Other Pie Elite all forums
this forum made possible by our volunteer staff, including ...
Marshals:
  • Campbell Ritchie
  • Jeanne Boyarsky
  • Ron McLeod
  • Paul Clapham
  • Liutauras Vilda
Sheriffs:
  • paul wheaton
  • Rob Spoor
  • Devaka Cooray
Saloon Keepers:
  • Stephan van Hulst
  • Tim Holloway
  • Carey Brown
  • Frits Walraven
  • Tim Moores
Bartenders:
  • Mikalai Zaikin

Unable to mark as merged with subclipse

 
Ranch Hand
Posts: 83
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
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
 
Rob Dennett
Ranch Hand
Posts: 83
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator

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).
reply
    Bookmark Topic Watch Topic
  • New Topic