I'm already having trouble with an extinction merging, and my local support is not around ... so I was hoping that anyone here might be able to help. Yes, I have read the document, I need a human response because this merge is very important.
I am trying to merge from branch 123 to Branch 124, which is directly on Branch 123 from Branch. My merge command is:
svn merge -R 18089: HEAD svn + ssh: //my.private.url/usr/local/svn/myappname/branches/123/.
Here is a freshly checked copy of current directory branch 124. Amendment 18088 was the last revision which brought the branch 124 to date
The result of the merge has been clearing the changes made in the branch 124 since the last refresh. Is syntax wrong? Is something wrong?
To simplify the svn merger, my mental model is to behave like a diff-> patch For example, if you are merging 124 into 123, then
svn diff -r 18089: HEAD svn / myappname / branches / 123 You should change what you intend to patch / merge in your target path. To make sure very closely make sure that it is not removing those things that you want to be in 124.
If the difference looks fine, / P>
svn merge -r 18089: HEAD svn / myappname / branches / 123 svn / myappname / branches / 124 Merge the difference, except for the previous command, and you merge the merge target directory at the end of commmand
Comments
Post a Comment