Re: How to resolve non-recursive commit of moved/renamed folders

On 20/03/2017 23:19, Vladimirs wrote:
> I committed my changes to Branch A (couple file changes + added a new
> folder and new file in that folder).
>
> Then I merged changes forward to Branch B, however when I am trying
> to commit I get "Non-recursive commit of moved/renamed folders"
> warning. In changelist I can see:
>
> New Folder Added (+) New Folder/New File Normal (+)
>
> Why this is happening? I simply added a new folder with new file to
> Branch A and folder doesn't exist in Branch B so I would expect a
> straight-forward merge.

You need to commit/merge the common base folder of the old and new
locations, not the individual folders themselves.

It's usually best to always do commits/merges at the root of the
repository, never in a subfolder.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3222304

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-03-25 01:33:49 CET