svn: Aborting commit: 'xxxx' remains in conflict 解决

1. svn remove --force filename    
2. svn resolve --accept=working  filename    
3. svn commit