I've been using git-svn to help me interact with the feedparser Subversion repository, and it's turned out to be a great tool. I've left git master as a pristine copy of svn trunk and have been doing all of my work in branches, but after several of my patches were committed to svn trunk, I had to figure out how to update git master with the changes. At first I simply ran
$ git svn fetch
and the three patches were downloaded in short order...except where did they go? After hunting around I discovered that they were placed in
refs/remotes/trunk. So as a reminder to myself I'm simply posting how I merged them into master:
$ git merge refs/remotes/trunk
Clearly there are things I don't understand about how git works, but at least now I'll remember the command I need to use.