title: Can git and subversion play nice together?
body: <p>I have recently decided to take the git plunge, and am really enjoying using git, even on Windows. </p>
  
  <p>My current open source project <a href="http://code.google.com/p/videobrowser/source/checkout" rel="nofollow noreferrer">lives on subversion</a>, all devs are familiar with subversion so I would like to keep subversion as the "source of truth" for now. </p>
  
  <p>Nonetheless, I want to use git, so I went ahead and created a copy of the source <a href="https://github.com/SamSaffron/Media-Browser/tree/master" rel="nofollow noreferrer">on github</a> using <a href="http://git-scm.com/docs/git-svn" rel="nofollow noreferrer">git svn</a>. All my work is done against the source in github and I push my changes to github. Once every few days I also push my changes to svn and rebase. </p>
  
  <p>The initial import seemed to go ok, but now every time I do a "git svn rebase" I keep on getting conflicts, even on files I have not changed in my get repository. This is causing me <a href="http://github.com/sambo99/Media-Browser/commit/c120af912012219f6947727109d7f5863a8a85ce" rel="nofollow noreferrer">much pain</a>.</p>
  
  <p>Eg. </p>
  
  <pre>
  $ git svn rebase
  First, rewinding head to replay your work on top of it...
  Applying: Added git ignore file
  c:/Users/sam/Desktop/MediaBrowserGit/trunk/.git/rebase-apply/patch:12: trailing
  whitespace.
  */obj/*
  error: .gitignore: already exists in index
  Using index info to reconstruct a base tree...
  :12: trailing whitespace.
  */obj/*
  warning: 1 line adds whitespace errors.
  Falling back to patching base and 3-way merge...
  Auto-merging .gitignore
  CONFLICT (add/add): Merge conflict in .gitignore
  Failed to merge in the changes.
  Patch failed at 0001 Added git ignore file
  
  When you have resolved this problem run "git rebase --continue".
  If you would prefer to skip this patch, instead run "git rebase --skip".
  To restore the original branch and stop rebasing run "git rebase --abort".
  
  rebase refs/remotes/git-svn: command returned error: 1
  </pre>
  
  <p>My questions: </p>
  
  <ol>
  <li><p>Is there any way I can tell git to sync itself up with svn using svn as the source, so I can start with a clean slate. (export latest, check in changes and reset the svn refs somewhere) </p></li>
  <li><p>Are there any tips and tricks to getting this scenario to work consistently? </p></li>
  <li><p>Should I have the <a href="http://www.pathf.com/blogs/2009/01/handling-crlf-in-git/" rel="nofollow noreferrer">core.safecrlf and core.autocrlf</a> options set to true? It seems I will need a bit of hoop jumping. </p></li>
  </ol>
  
  <p>Related: </p>
  
  <ul>
  <li><a href="http://kerneltrap.org/index.php?q=mailarchive/git/2008/4/16/1450834/thread" rel="nofollow noreferrer">http://kerneltrap.org/index.php?q=mailarchive/git/2008/4/16/1450834/thread</a> </li>
  <li><a href="http://markmail.org/message/vaois4kkr5ggugqs#query:git%20crlf+page:1+mid:i4flex6vmt5tdala+state:results" rel="nofollow noreferrer">http://markmail.org/message/vaois4kkr5ggugqs#query:git%20crlf+page:1+mid:i4flex6vmt5tdala+state:results</a></li>
  <li><a href="http://code.google.com/p/msysgit/issues/detail?id=271" rel="nofollow noreferrer">http://code.google.com/p/msysgit/issues/detail?id=271</a></li>
  </ul>
  
  <p>It seems getting line endings right is a bit of a black art. </p>
  
  <p>(I realize that this question probably needs to be expanded, please comment on the places that need expanding)  </p>