Command mode: SVN tree conflict (local unversioned, incoming add upon update)

When the working directory is modified or deleted, the svn update will easily cause a tree conflict "tree confilict". A similar prompt will appear.

1. Local unversioned, incoming add upon update

If you use a graphical client, you can use the Compare file and Conflict Resolution buttons. If you use a command line, the situation is similar to the following: (removed_directory is a directory where you work)

1. $ SVN status
   
2. D c removed_directory
   
3. > Local unversioned, incoming add upon update
   
4. Summary of conflicts:
   
5. Tree conflicts: 1

To solve this problem, run the following command:

1. $ SVN resolve -- accept working removed_directory
   
2. Resolved conflicted state of 'removed _ directory'
   
3. $ SVN revert removed_directory
   
4. Reverted 'removed _ directory'
   
5. $ SVN status
   
6. $

Command mode: SVN tree conflict (local unversioned, incoming add upon update)