Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I am trying to commit changes that I have made om a project but get the following message.
Some of the selected resources are conflicting. You should resolve the conflicts before commiting.
Any advice perhaps as to how to resolve this so that I can commit?
Kind regards
Right click the project and select
Team->Synchronize with Repository. Switch to theTeam Synchronizationperspective. The left viewSynchronizeshows your local and the remote changes. You can set the filter to conflicting resources by selecting the red icon (with a arrow to the left and right) from the toolbar. Double click one resource and you will see the conflicts. After you resolved them you can commit your changes.