title: How to resolve a git conflict when pulling (in eclipse)
body: <p>I accidentally made a mess of and then deleted a java project from eclipse (more specifically, I accidentally moved the classes to a different project and then moved them back, and then deleted the project [from the file system] in eclipse), and now whenever I try to do team -> pull (after running ant -f ...), a window pops up saying that there's a checkout conflict with the files that were deleted. How do I get past this conflict and make pulling work again? I could create a new workspace, checkout everything into there again, and copy the code that I'm currently developing into that workspace, but there must be an easier way. Please educate this git n00b.</p>