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

When working directory modifications delete obsolete updates using SVN update it is easy to have tree conflicts "trees confilict". Similar prompts appear.

Local unversioned, incoming add upon update if you use a graphical client, you can resolve it by comparing files and resolving conflict buttons.

If you are using the command line,

The situation is similar to the following: (where Removed_directory is a directory where you work)

The code is as follows	Copy Code
$SVN status D C Removed_directory > Local unversioned, incoming add upon update Summary of conflicts: Tree conflicts:

1 This situation can be solved by the following command:

code is as follows	copy code
$ svn Resolve--accept working Removed_directory resolved conflicted state of ' removed_directory ' $ svn revert removed_d Irectory reverted ' removed_directory ' $ svn status $