|
|
|
|
|
|
by jedbrown
5660 days ago
|
|
|
The svn issue seems under-appreciated. In my experience, far and away, the best way to merge subversion branches is to pull them in with git-svn, rebase, and push back to subversion. I've done this more than once for projects that I'm only tangentially involved with. |
|
|