"Remains in conflict" when committing

Please help.. Every so often when I try and submit work that I have done to
my Springloops server I get the error message: "Aborting
commit:'C:\svnRoot\error' remains in conflict".

I have tortoisesvn running on my local machine and all I did was I tried to
remove the /error directory from svn source control. I right-clicked on it
and said:Delete and add to ignore list. This was just where my local error
log were dumped and there is no reason to replicate that. Now if I try to
commit I get the error message.

Please help,this is driving me up the wall!!

-- 
View this message in context: http://www.nabble.com/%22Remains-in-conflict%22-when-committing-tp25427539p25427539.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2394363
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].