We are moving from a svn repository to a git repository
Although the svn trunk was migrated, the branches were not(svn server is maintained by a different team).
So I am left with a local copy of svn branch which is almost 6 months older than the current git repository.
If you want to ask why 6 months, it was a huge feature so 2 months went into development and rest 4 months were wasted because the feature could not be released due to some blockers.
How can I now merge my local svn branch which has these bunch of changes on 6 months old code to a git branch ?