I have a branch on SVN and I'd like to keep it up to date, I am used to git, where I do a merge master into branch and it has all the modifications, so I am asking is it enough to merge just the last revision from trunk into my branch or I shall do a merge of all the revisions? And if this is the case (merge all the revisions) why is it necessary?
Asked
Active
Viewed 695 times
0
-
Read the documentation http://svnbook.red-bean.com/en/1.8/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.stayinsync – bahrep Oct 26 '16 at 13:17
-
but I met a case where a file has changed 2-3 times, and when merging all the revisions, I get into conflicts... – sop Oct 26 '16 at 13:22
-
And it says that first I shall merge my branch into trunk then do the merge from trunk ... – sop Oct 26 '16 at 13:28
-
:| I think the problem is linked somehow to [this one](http://stackoverflow.com/questions/490164/svn-reintegration-merge-error-must-be-ancestrally-related) – sop Oct 26 '16 at 13:35