I have a question about when to use --reintegrate. We created a branch called Beta1 that we are using as a temp trunk for now while we try some new changes. Each developer then has a branch that they
Is there a way in Subversion 1.6, using logs, mergeinfo, etc., to determine when a merge was done with the --reintegrate option?(Thi开发者_运维知识库s presumes one knows which commits are the results
We did following ugly thing: So, how can we achieve another reintegrate? What did I try so far? well, the obvious merge - which fails brutally!
Since my SVN repository still uses Subversion 1.4, I am using svnmerge.py for merge tracking. I have a feature branch kept in sync with trunk (svnmerge init after branching, then svnmerge merge every
I have 2 branches what I\'m reintegrating In both branches I have same CFG files what I dont want to be reconciled.
I\'ve been trying to get my head around SVN merging/reintegrating and have read a these articles/books:
I have read quite a bit about the need to re-integrate when you merge from a branch back to the trunk in SVN (an article about foreign repository merges was really helpful).
I\'m trying to reintegrate a development branch into the trunk in my Subversion 1.5 repository. I merged all the changes from the trunk to the development branch prior to this operation. Now when I tr
If you always synchronise a feature branch before you merge it back. Why do you really have to use the --reintegrate option?
加载中,请稍侯......