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 the Team Synchronization perspective. The left view Synchronize shows 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.