git migration from svn - aragorn/home GitHub Wiki

• http://blogs.atlassian.com/2012/01/moving-confluence-from-subversion-to-git/

• https://www.atlassian.com/git/tutorials/migrating-convert

• example

• java -jar ~/svn-migration-scripts.jar create-disk-image 15 GitMigration

• prepare authors.txt

• git svn clone --trunk=/myproject/trunk --branches=/myproject/branches --authors-file=authors.txt --username=aragorn http://subversion.company.com/private/myproject myproject

• git push -u origin --all

! [rejected] master -> master (non-fast-forward) error: failed to push some refs to '...' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

* git pull origin master
* git push -u origin --all

Counting objects: 16181, done. Delta compression using up to 8 threads. Compressing objects: 100% (2421/2421), done. Writing objects: 100% (16180/16180), 216.46 MiB | 2.84 MiB/s, done. Total 16180 (delta 13472), reused 15951 (delta 13269)