Loading presentation...

Present Remotely

Send the link below via email or IM

Copy

Present to your audience

Start remote presentation

  • Invited audience members will follow you as you navigate and present
  • People invited to a presentation do not need a Prezi account
  • This link expires 10 minutes after you close the presentation
  • A maximum of 30 users can follow your presentation
  • Learn more about this feature in our knowledge base article

Do you really want to delete this prezi?

Neither you, nor the coeditors you shared it with will be able to recover it again.

DeleteCancel

Make your likes visible on Facebook?

Connect your Facebook account to Prezi and let your likes appear on your timeline.
You can change this under Settings & Account at any time.

No, thanks

GitFlow - Git Workflow Model

Quick intro to GitFlow model
by

Tomasz Chodakowski

on 24 August 2015

Comments (0)

Please log in to add your comment.

Report abuse

Transcript of GitFlow - Git Workflow Model

GitFlow - Git Branching Model
Git can be confusing
GitFlow - a branching model and an extension on top of git

taking advantage of low cost branch operation in git
develop
master
"git flow init"
main development happens here

features branch off and get merged in
releases branch off from it
production ready, each change is a new release

releases get merged in
hotfixes branch off from it and get merged back in
feature/ftr1
feature/ftr2
development of major features

exists only for the purpose of feature development
branch off and merge into develop
typically only in developer repo
"git flow feature start ftr1"
"git flow feature finish ftr1"
release/v1.1.0
preparing for a release

feature freeze, only minor bugfixes
branch off develop and merge into develop and master
"git flow release start 1.1.0"
"git flow release finish 1.1.0"
hotfix/1.0.1
quick bug fixes to master branch

short lived, most pressing bugs fixed here
branch off master and merge into develop and master
creates new release
"git flow hotfix start 1.0.1"
"git flow hotfix finish 1.0.1"
What next?

Integration with the rest of infrastructure:
IDE, Build System, CI, Issue Tracking...

Beyond code

Could similar mechanism be applied in data science settings:
datasets, data catalogues, machine learning models and analytical reports

"To keep your sandbox tidy, always remember to fetch with --prune.

Why is it not the default? Because that is not git’s way."


found on google under
git koans
What`s left

Branch publishing
Support branches
More subtle details

Adds structure and simplifies interaction...
tag:v1.0.1
tag:v1.1.0
tag:v1.0.0
http://nvie.com/posts/a-successful-git-branching-model/

https://github.com/nvie/gitflow

http://stevelosh.com/blog/2013/04/git-koans/

http://semver.org/

semantic verisoning
Tomasz Chodakowski
Full transcript