Best Regards, Kit Kai, MVP (SharePoint Portal Server)
The melody of logic will always play out the truth. ~ Narumi Ayumu, Spiral
Either way is fine. When you commit, it'll reflect a conflict. I'm not too sure about a deleted files though. It can be filed as a bug at subversion if it persists.