SVN: Tree conflicts Solution

Solución de conflictos de árbol (Tree conflicts solution):

[user@dev]$ svn st

...

!     C t/unit/models/Toolbox/Restrictions

     >   local delete, incoming edit upon merge

Summary of conflicts:

 Tree conflicts: 32

[user@dev]$ mkdir t/unit/models/Toolbox/Restrictions

[user@dev]$ svn revert t/unit/models/Toolbox/Restrictions

Reverted 't/unit/models/Toolbox/Restrictions'

[user@dev]$ svn st

...

?       t/unit/models/Toolbox/Restrictions

Summary of conflicts:

 Tree conflicts: 31

#Luego enviar los cambios

Reference:

http://stackoverflow.com/questions/4317973/svn-how-to-resolve-local-edit-incoming-delete-upon-update-message
http://svnbook.red-bean.com/en/1.7/index.html