title: Git-SVN merge lost my link to trunk
body: <p>EDIT: I see that this question has been asked before! <a href="https://stackoverflow.com/questions/2835791/git-svn-reset-tracking-for-master">git-svn: reset tracking for master</a> Someone with the right permissions can probably close this as a duplicate.</p>
  
  <p>I'm using git-svn. I recently finished working on a branch in git that was tracking a branch in SVN. While working in the branch, I was using the following two commands </p>
  
  <pre><code>$ git svn rebase
  $ big svn dcommit
  </code></pre>
  
  <p>and all was well. "master" in git was tracking svn/trunk and "myBranch" in git was tracking svn/branches/myBranch. But after I merged everything locally in git</p>
  
  <pre><code>$ git checkout master
  $ git merge myBranch
  </code></pre>
  
  <p>I went to push ... and assumed that master would push to svn/trunk. But it didn't. Instead, "master" now ALSO pushes to svn/branches/myBranch. Somehow, when I merged "myBranch" into "master", "master's" tracking got altered.</p>
  
  <p>I am probably doing this wrong - but I tried to explicitly "push" to trunk ... </p>
  
  <pre><code>$ git svn dcommit remotes/trunk master
  </code></pre>
  
  <p>But that syntax failed and now I've got</p>
  
  <pre><code>$ Committing to http://&lt;repo&gt;/trunk ...
  dcommitted on a detached HEAD because you gave a revision argument.
  The rewritten commit is: b461234...
  </code></pre>
  
  <p>with SVN trunk still not updated.</p>
  
  <p>How do I merge in git and then push that to SVN? I was following the guide <a href="http://progit.org/book/ch8-1.html" rel="nofollow noreferrer">here</a> which implies that I can merge with normal git syntax. It just doesn't follow up and explain why my "master" is not tracking the branch I merge in.</p>
  
  <p>I also have <a href="http://www.git-tower.com/" rel="nofollow noreferrer">git-tower</a> which I use in parallel with the command line and after I manually merged as above, tower now "shows" all the remote branches in the drop down to "push" or dcommit to, but I can't change the selection from svn/myBranch ... which possibly implies that I can't?</p>