title: git svn workflow - feature branches and merge
body: <p>I am using git-svn with the following workflow now</p>
  
  <pre><code>git clone &lt;SVN TRUNK URL&gt; #done once
  </code></pre>
  
  <p>subsequently when I work on a feature</p>
  
  <pre><code>git branch featureZ
  git checkout featureZ
  #make edits for featureZ
  git commit
  
  git checkout master
  git svn rebase # fetch changes from server
  
  git checkout featureZ #go back to branch
  #git merge master 
  git rebase master #get the changes from SVN-&gt;master onto the branch now. Optional if I want the branch to be current. (EDITED: Got from the answer given below)
  
  #make edits for featureZ
  git commit #featureZ completed
  
  git checkout master
  git merge featureZ #getting featureZ onto master. Prepare to send to SVN
  
  git svn dcommit #push featureZ back to SVN
  </code></pre>
  
  <p>Now some points of note when I do git merge of feature onto master, all the individual commits in featureZ branch gets merged as one which is fine with me.</p>
  
  <p>The commit message is replaced as "merged with featureZ". That can be fixed with <a href="http://www.kernel.org/pub/software/scm/git/docs/git-fmt-merge-msg.html" rel="noreferrer">merge fmt msg</a>.</p>
  
  <p>Now my question is
  Is there anything that can go wrong with this workflow or needs to be taken care of. I read in <a href="http://git-scm.com/docs/git-svn" rel="noreferrer">git-svn manual</a> that merge should not be done when working with git svn. Is what I am doing in my workflow is what that they are referring to? if so what kind of problem will it cause? One thing is I don't want to do something that messes with the SVN mainline.</p>