Not sure what variant of SVN you were using that didn't support branching, everyone I knew used branches. It did have problems with occasional inexplicable tre

Not sure what variant of SVN you were using that didn't support branching, everyone I knew used branches. It did have problems with occasional inexplicable tree conflicts, which I do not miss. But that's the same as the pain of trying to rebase in git when things have diverged and it just starts spewing repeated conflicts for each and every commit. In either case, the easiest thing to do is make a fresh branch, patch your changes over, and go from there vs. trying to reintegrate the broken branch.