I use SVN as the version control system for most of my programming in Linux. It’s a pain sometimes (unnecessarily I believe), but it gets the job done most of the time.
I just now ran into a common problem where I try to remove a directory, and then there’s a conflict for god knows what reason. Perhaps I didn’t do an svn update… The page Dealing with Structural Conflicts proposes a solution that worked for me:
svn remove --force filename
svn resolve --accept=working filename