Right click project directory – > team–> Show Tree Conflict–> In eclpise, a tab view will appear to show the contents of tree conflict. Select conflicts one by one in the list, right-click to mark them as resolved, and then go back to the project and submit the changes