allow non-empty git repository

You can let either git or svn 'win' the initial merge unconditionally.
Maybe later you can resolve the merge manually.