svn2git

svn dev style like this
--
you:
  svn cp /trunk /branches/xxx
  svn co /branches/xxx
  ooxx... ooxx..
  svn ci -m "ooxx"
  
sb:
  cd trunk
  svn merge -r 12345:12356 /branches/xxx
  svn ci -m "merge diff 12345:12356@branches/xxx"

==
git dev style like this:
-
you:
  fork main_repo your_repo
  git clone your_repo.git
  git remote add upstream main_repo.git
  git brance xxx
  git checkout xxx
  ooxx.. ooxx..
  git add -A .
  git commit -m "ooxx"
  git push --set-upstream origin ooxx
  git push
  create your pull request (your_repo:ooxx --> main_repo:master)
  
sb:
  merge your pull request
  
  
==

upmerge (sync your dev codes)

svn
-
svn cp /trunk /branches/ooxx2
svn co /branches/ooxx2

git
-
git fetch upstream
git merge upstream/master
git push
git branch ooxx2
git checkout ooxx2