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

Source: Internet
Author: User
Tags svn svn 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
$

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.