Maintenance

For some reason I keep getting tree conflicts in the Moses SVN. This is the only way I've found to resolve them:

svn resolve --accept working -R .

You need to do this from one directory above the level of the actual conflict. I'm still trying to figure out why this keeps happening, but it may be something to do with the fact that the project was dormant for a good while, during which time the SVN remained unchanged, but my working copy was affected by a crash and restore of my home directories.