I ran a git filter-branch on a rather large repo (~8000 commits) to remove certain binaries, but now when I do git svn rebase to keep my repo up to date, it results in a huge list of conflicts. I'm guessing it's because both commands involve rewriting the history.
Is there any way I can sync to Git from SVN after my filter-branch without these conflicts ? Will any future rebase also result in such problems too ? (I'm only syncing one way from SVN to Git)
As I see it there is nothing you can do to make filter-branch and svn rebase compatible. You're rewriting history which has a relationship to a remote. As such you change the commit hashes and make the mapping of the SVN rev_map utterly useless.
It would be a different story if you removed the remote after filter-branch, in that case it simply wouldn't matter, but as it stands I see no way to make this work.