While working on addons.mozilla.org I ran into an issue of git svn rebase continually asking me to merge a file, over and over.
git svn rebase