Using Git and Svn To fetch the latest from guice's svn: git svn fetch To merge changes from svn git merge trunk