All geek questions in one place

Unable to switch to trunk

I am just starting with SVN using the tools mentioned above, since I had no problems for normal updating and fixing, now my problem arises when I try to update my trunk with changes in the branch.

First, I started using the branch / tags parameter to create a branch from the trunk (is this the right way to do this? Or can I just copy the contents from the trunk to the branch folder?).

After some changes made in the branch folder, I try to copy these changes to trunk, following the other answers, here they say to switch the working directory to the trunk, but whenever I try to do this, I get

'https://sc-mika/svn/repo.test/trunk' shares no common ancestry with 'C:/Users/SC'.

What am I doing wrong?

+6
source share
1 answer

To get branch changes in the trunk, you must merge the branch into the trunk (not just switch your WC) - read the SVN book

+4
source

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

More articles:


All Articles