All about Git and SVN
Creating a Patch Patch for Working Copy (Not Committed) git diff > patch.diff Patch from on...
SVN File already exists error svn update path/ --accept=mine-full