18:00 Socialize + Pizza
18:30 Presentation (Umwelt+Praqma)
19:45 Discussion + socialize
The CoDe:U Git Flow
The fact that most prehistoric version control systems weren't particularly good at branching and especially not at merging leads to the consequence, that many teams today find themselves in a situation where they have never before merged as intensely as they now do on Git.
A branching strategy is required.
@nvie's blog post "A successful branching strategy (http://nvie.com/posts/a-successful-git-branching-model/)" has become the unreflected first choice of strategy in many shops. But @nvie's flow has several issues that needs to be mended.
Together with Atmel (http://www.atmel.com/), a worldwide leader in the design and manufacturing of microcontrollers, we have revised, simplified and optimized the flow to a level that is now being rolled out to all developers in the Atmel corporation.
We've named it "The CoDe:U Git Flow (http://www.praqma.com/git-flow)"
It's based on a simple set of principles: the Ten Git Commitments.
Through the development of the Pretested Integration plugin (https://wiki.jenkins-ci.org/display/JENKINS/Pretested+Integration+Plugin) for Jenkins CI (Open Sourced), it supports a fully automated strategy that enables a guaranteed pristine integration branch and it keeps all promotions of commits to be located on just one long-lived branch.
A true release train.
The implementation is based on a simple naming convention of branches and it utilizes the standard Git SCM plugin (https://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin) in Jenkins CI as well.
As an intentional property of the flow it allows the developers to continue to exploit all the nice and cool features in Git. No policy enforcement is narrowing the freedom of the developers creativity.
The technology dependency is kept at a minimum and requires only the Git SCM plugin and the Pretested integration plugin on Jenkins CI.
The flow is compliant with all Git repository browsers that we know of, and we have implemented in on both GitHub, GitLab and Atlassian's Stash
We humbly claim that this is Git Done Right.
The session is Organized by Praqma and hosted by Umwelt.