# Gavin Andresen
# 2010-10-06 14:26:13
# https://bitcointalk.org/index.php?topic=1319.msg15650#msg15650

I updated most of my git branches to svn rev 161 last night, including monitorreceived.  That's easy: @p{brk}
   git svn fetch   (but you have to have an "svn-remote" setup in your .git/config) @p{brk}
   git merge refs/remotes/svn/trunk    (I could git rebase instead, but merge seems less magical to me) @p{brk}
    ... fix any merge conflicts and test then git commit, if needed  (usually there are none) @p{brk}
   git push   (to push up to github) @p{par}

Repeated on each branch (I'll try to keep svn, svnTEST and monitorreceived up-to-date). @p{par}

Keeping the patch file up-to-date is another couple of steps, and I could/should automate it. @p{par}

doublec: thanks for the bug report, I'll look into it as soon as I get this machine setup. @p{brk}