170 likes | 447 Views
VIVO and Git. What kind of project is VIVO?. Who are the developers? . Tools history – Cornell . Tools history – NIH. Tools history – DuraSpace. Why move to Git on GitHub ?. Community Cool kids Pull request Demo: https://github.com/vivo-project/VIVO/pull/ 1. The transition.
E N D
What kind of project is VIVO? • Who are the developers?
Why move to Giton GitHub? • Community • Cool kids • Pull request • Demo: https://github.com/vivo-project/VIVO/pull/1
The transition • svn2git and other tools • Pruned sections of the repository • Converted retroactively to new workflow • “Master” branch contains nothing but releases • Re-training
Benefits of Git • Commit to your own repository without affecting others • Staging area, so you choose what to commit • Right down to the individual line • Revise commits • look like you did it right the first time • Changes instead of revisions • Means easier merging • Which means less fear of branching
A challenge to learn • Not a 1-to-1 translation from Subversion • Commits, parent and pointers • One workspace, many versions • Command line options are not obvious • No revision number
Tool set • Command line • Eclipse plug-in • A year ago, I found it buggy. • SourceTree • Free tool from Atlassian • For Windows and Macintosh • Integrates well with GitHub • Also works with Mercurial
GitFlow • The archetype • http://nvie.com/posts/a-successful-git-branching-model/ • Acceptance in the community, but not the only one • Suited for released products • Tool integration • Scripts, SourceTree, etc.