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.
I had a branch open for a bug. In that branch I wrote a library. While that bug was under review, I had to use that library in a new branch [...]


