Consider migration from svn to git. The code can remain on SourceForge and still use git. Or the code could move to GitHub or BitBucket. Or (yuck) only support git merges by posting instructions for checking out two versions from svn, importing them both to git, merging them in git, and returning the result to svn.