All geek questions in one place

SVN Vertex Vertex Elements

I am using VisualSVN server with TortoiseSVN and AnkhSVN in Visual Studio.

I have Trunk for which some developers in other teams regularly make various small changes.

I have a branch on which a fairly large new development is being built. Like a regular weekly routine, I merged Trunk into this thread. Everything seems to be going fine.

I came to make another such merger with Trunk in this thread, and I get trucks: -

The last merge operation attempted to add the directory 'nameoffolder', but it has already been added locally.

However, these are folders that were versioned and have been in Trunk and Branch for quite some time.

I get a similar thing with files: -

The last merge operation attempted to add the "QueueCleanUp.ashx" file, but the working copy was difficult.

This seems to be widespread throughout the industry, the vast majority are not related to anything the branch team is working on.

Has anyone seen this before? How can I solve this problem without work?

+4
source share
1 answer

AnkhSVN has an update method using allow unversioned obstructions . To do this, open View -> Pending Changes , from here select the Update drop-down list and select Update to specific revision... In the dialog that appears, make sure Latest Revision selected and check allow unversioned obstructions .

I am sure there is a similar option in TortoiseSvn, but I do not have this installed, so I can not check.

The command line identifier is the --force switch for the update command:

 svn update --force c:\myproject
+1
source

Source: https://habr.com/ru/post/1303544/

More articles:


All Articles