VIVO and Git

What kind of project is VIVO?

Who are the developers?

Tools history – Cornell Version control Subversion at Mann LibraryWiki Confluence at CornellIssue tracking JIRA at Cornell LibrariesMailing lists Listserv at CornellFiles distribution FTP at Mann Library

Tools history – NIHVersion control Subversion at SourceForgeWiki MediaWiki at SourceForgeIssue tracking JIRA at Cornell LibrariesMailing lists Mailman at SourceForgeFiles distribution SourceForge

Tools history – DuraSpace

Version control Git at GitHubWiki Confluence at DuraSpaceIssue tracking JIRA at DuraSpaceMailing lists Mailman at SourceForgeFiles distribution SourceForge

Why move to Git on GitHub?

CommunityCool kidsPull request

Demo: https://github.com/vivo-project/VIVO/pull/1

The transitionsvn2git and other toolsPruned sections of the repositoryConverted retroactively to new workflow

“Master” branch contains nothing but releases

Re-training

Benefits of GitCommit to your own repository without affecting othersStaging area, so you choose what to commit

Right down to the individual line

Revise commitslook like you did it right the first time

Changes instead of revisionsMeans easier mergingWhich means less fear of branching

A challenge to learnNot a 1-to-1 translation from SubversionCommits, parent and pointersOne workspace, many versionsCommand line options are not obviousNo revision number

Tool setCommand lineEclipse plug-in

A year ago, I found it buggy.

SourceTreeFree tool from AtlassianFor Windows and MacintoshIntegrates well with GitHubAlso works with Mercurial

Git FlowThe archetype

http://nvie.com/posts/a-successful-git-branching-model/Acceptance in the community, but not the only oneSuited for released products

Tool integrationScripts, SourceTree, etc.

Demo