Backstory . Got a job as an entry-level web developer. The initial developer leaves right when I start. All responsibility for me. Never used SVN. Blind.
Problem :
I keep getting errors like
'svn://svn/svn/xxx/project_name/branches/dev@330' must be
ancestrally related to 'svn://svn/svn/xxx/project_name/trunk@326'
The process with which I start a new project:
Make a directory for the project on my computer with subfolders:
project_name/branches
project_name/branches/dev
project_name/tags
project_name/trunk
Right-click the project root, select the project root and Addinto the repository
(The following is what I should do for current projects, and this does not create problems in them, but breaks down for new projects when merging)
Commit branch "dev"
Merge "dev" "trunk" ( ) * BREAKS HERE *Commit "trunk"svn up ..
SVN, . , 3-6 , , must be ancestrally related to . , ? .