:(

(datura)(~/git/sgn master$ )$ git rebase git-svn
First, rewinding head to replay your work on top of it...
Applying: Add more tests to t/bulk.t
Applying: Add more tests for downloading bulk data to t/bulk.t
Applying: Add tests for microarray and clone_search modes on /bulk/input.pl
Applying: Add test for bulk bac_end
Applying: added markup_string.mas, which displays an arbitrary string formatted with Text.Markup
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging mason/util/markup_string.mas
CONFLICT (add/add): Merge conflict in mason/util/markup_string.mas
Recorded preimage for 'mason/util/markup_string.mas'
Failed to merge in the changes.
Patch failed at 0005 added markup_string.mas, which displays an arbitrary string formatted with Text.Markup

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

(datura)(~/git/sgn (09b838f...)*+$|REBASE )$ vi mason/util/markup_string.mas 


Press ENTER or type command to continue
(datura)(~/git/sgn (09b838f...)+$|REBASE )$ git rebase --continue
Applying: added markup_string.mas, which displays an arbitrary string formatted with Text.Markup
Recorded resolution for 'mason/util/markup_string.mas'.
Applying: added small test for markup_string.mas
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging t/mason/util/markup_string.t
CONFLICT (add/add): Merge conflict in t/mason/util/markup_string.t
Failed to merge in the changes.
Patch failed at 0006 added small test for markup_string.mas

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

(datura)(~/git/sgn (7fc0b03...)*+$|REBASE )$ vi t/mason/util/markup_string.t 

[No write since last change]

Press ENTER or type command to continue
(datura)(~/git/sgn (7fc0b03...)*+$|REBASE )$ git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git add
(datura)(~/git/sgn (7fc0b03...)*+$|REBASE )$ git add t/mason/util/markup_string.t
(datura)(~/git/sgn (7fc0b03...)+$|REBASE )$ git rebase --continue
Applying: added small test for markup_string.mas
Recorded resolution for 't/mason/util/markup_string.t'.
Applying: reimplemented six-frame translation using Text.Markup, BLAST submission not yet implemented
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging documents/inc/sgn.css
CONFLICT (content): Merge conflict in documents/inc/sgn.css
Auto-merging mason/sequence/sixframe_translate.mas
CONFLICT (content): Merge conflict in mason/sequence/sixframe_translate.mas
Auto-merging mason/sequence/threeframe_translate.mas
CONFLICT (add/add): Merge conflict in mason/sequence/threeframe_translate.mas
Auto-merging mason/tools/sixframe_translate_standalone.mas
CONFLICT (add/add): Merge conflict in mason/tools/sixframe_translate_standalone.mas
Recorded preimage for 'documents/inc/sgn.css'
Recorded preimage for 'mason/sequence/sixframe_translate.mas'
Recorded preimage for 'mason/sequence/threeframe_translate.mas'
Recorded preimage for 'mason/tools/sixframe_translate_standalone.mas'
Failed to merge in the changes.
Patch failed at 0007 reimplemented six-frame translation using Text.Markup, BLAST submission not yet implemented

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".