SVN file merge issue

I am using SVN, even after committing files, when i merge them from one folder, i got tree conflict error. But still i didn’t get any file. If one file got conflicted, I should have got that one file. But I didn’t get any.

Did you move any files and not tell SVN about it?

Tree can be tough to get rid of, my typical response when I’ve got a SVN local copy that is misbehaving is to just do another complete checkout in a clean directory rather than fight it.