Resolve SVN error: "must be ancestrally related to ..."

Navigation
4

With TortoiseSVN I created a branch for production from my trunk , but after a while when I try to merge trunk in production gives the following error:

  

' link ' must be ancestrally related to ' link '

Why does this happen and how do I resolve it?

    
asked by anonymous 29.01.2015 / 18:45

1 answer

1

Has the branch been created manually or by using the "TortoiseSVN -> Branch / tag" option? One possible workaround may be to svn merge --ignore-ancestry .

Related questions in stackoverflow in English:

29.01.2015 / 19:18
How to manipulate widgets of the main window through a signal function (C and GTK +)? SrLua - Problem after compiling