svn-reintegrate – Tarik Billa

Missing ranges error message when reintegrating a branch into trunk in Subversion 1.5

December 20, 2023 by Tarik

We struggled with this issue for few weeks and we finally got it solved. In our case, we worked on a branch that was merged with all trunk revisions on a daily basis. When we tried to reintegrate it (merge back to trunk) we got this error. When we tried to merge the missing ranges … Read more

How to Subversion rebase?

May 13, 2023 by Tarik

Generally speaking, rebasing is the act of incorporating upstream changes into a feature branch, before merging the feature branch back into the upstream branch. In git, the process is even more sophisticated, because the changes that have been made since the branch was created are first taken off and buffered, the upstream changes are applied, … Read more