SVN-GitHub rebase broken: Please help me. :(

Hello all,

I am using github as a final publishing point for an active subversion archive.    This has gone well for years.

However, I guess I clicked on something at github that added a file there, and now it’s in hell. :frowning:

Whenever I do my git svn rebase I get:

Applying: Set theme jekyll-theme-minimal
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Set theme jekyll-theme-minimal
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

… repeating forever and ever and ever …

At this point, the git repo is in a “you are in the middle of a rebase” state, which I can reset by deleting the ‘rebase-apply’ directory, but then I’m back to the prior state.  

I’m really really stuck, and don’t understand what’s going on.  If anyone can help, they would be my hero.  And if you can actually explain what’s going on to make me smarter, then you’d be my super-hero.

  • Bo Zimmerman