I find this way easier to merge branches and less conflicts: Copy trunk to a new branch, merge it with …
svn rebase svn-reintegrateI'm trying to reintegrate a development branch into the trunk in my Subversion 1.5 repository. I merged all the changes from …
svn merge branch trunk svn-reintegrateHere is the riddle: C:\code\trunk> svn merge --reintegrate http://svn.e.com/repos/branches/lih --accept postpone …
svn merge branching-and-merging svn-reintegrateMust a feature branch be deleted after it's merged (reintegrated) back to trunk? I prefer to constantly merge changes back …
svn tortoisesvn merge svn-reintegrate