svn-merge
SVN merge from trunk to branch after trunk directory name has been changed
I have a situation where I branched off trunk and after a number of days of development work in my branch, someone else changed the name of the project directory in trunk. Something like this:[详细]
2023-04-01 15:38 分类:问答SVN: Create a branch from branch and merge to trunk
We have a br开发者_Python百科anch B1, and it is still not stable yet so it is not in trunk. But we want to work with changes from B1 so we create a branch B2 from B1.[详细]
2023-03-20 15:20 分类:问答Is there a way to tell when reintegrate option used with svn merge?
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[详细]
2023-03-10 02:33 分类:问答Reintegrating a branch (like svn merge --reintegrate) using svnmerge.py
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[详细]
2023-03-01 10:51 分类:问答SVN merge renamed projects into trunk
I\'m currently trying to merge some changes from a branch back into the trunk, the changes in the branch debrand the name of each project in the trunk. So for simplicities sake开发者_高级运维 lets say[详细]
2023-02-20 02:46 分类:问答merge 2 svn branches together
I\'m working with an svn setup I\'m not used to and I need to merge new code from one branch to another.[详细]
2023-01-30 03:43 分类:问答Best practices regarding merging bugfixes from trunk into a feature branch using TortoiseSVN
I have a case where my branch represents a new version which in it there is a refactored data layer, however all of the bug fixes are applied to the trunk.[详细]
2023-01-25 02:19 分类:问答svn merge - moved repository to a different server, and now getting 'has different repository root' messages
This is kind of similar to subversion merge - "has different repository root than" - but appears to be a very different cause (especially as the answer for that question didn\'t resolve my p[详细]
2022-12-23 14:42 分类:问答Merge files with SVN
When there are conflicts between the working copy and the repository during updating, I\'m using XCode\'s built in tool FileMerge.[详细]
2022-12-18 17:52 分类:问答