title: Avoiding conflicts while using git-svn
body: <p>Folks I'm facing repeated code conflicts while pulling from the shared git repo in the following scenario:</p>
  
  <ol>
  <li><p>There is a common svn repository</p></li>
  <li><p>There are several developers who track/sync this common svn repo with their own local git repos using git-svn bridge(via git svn rebase/dcommit)</p></li>
  <li><p>From time to time these developers using git need to share their changes without affecting the svn repository. For this purpose they setup a shared git repo and exchange their work using pull/push commands</p></li>
  <li><p>It turns out these developers may face conflict problems due to usage of “git svn rebase” for syncing with the main svn repo. This happens because rebase operation rewrites history of the local git branch and it becomes impossible to push into the shared git repo and pulling from it often leads to conflicts.</p></li>
  </ol>
  
  <p>Anybody having the same problem?</p>