Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post...

32
Git It Together Discussing Source Control Nick Harris Kyle Richter Janene Pappas Ben Lachman Daniel Pfeiffer Brett Jones

Transcript of Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post...

Page 1: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Git It TogetherDiscussing Source Control

Nick Harris

Kyle Richter

Janene Pappas

Ben Lachman

Daniel Pfeiffer

Brett Jones

Page 2: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Overview

Quick History of Source Control

A Look at Popular Solutions Used Today

Panelist

Open Discussion

Page 3: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

The first thing to know about source control…

USE IT!Seriously. You should.

Page 4: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Why use Source Control?

Backup of your hard work

History of the code base

Collaborating on code

Maintaining multiple versions of an app

Page 5: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Early Source Control System

Page 6: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Early Source Control System

Source Code Control System (SCCS) - 1972

Revision Control System (RCS) - 1982

Concurrent Version System (CVS) - 1990

BitKeeper - 2000

Page 7: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Modern Source Control Systems

Subversion (SVN) - 2000

Mercurial (Hg) - 2005

Git - 2005

Page 8: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Subversion (SVN)

Centralized Source Control System

Notable Companies are Apple and Omni Group

Use to be the default Source Control option in Xcode

Created by CollabNet to Supercede CVS

Became a Top-Level Apache Project in 2010

Page 9: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Mercurial (hg)

Free under the GNU GPL v2+ license

Created by Matt Mackall in response to BitKeeper price change

Used by Adium, Growl and Python

Distributed Source Control written mostly in Python

Page 10: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Git

Official Source Control of the Linux Kernel

Also created as a response to pricing change of BitKeeper

Used by virtually everyone

Distributed Source Control written mostly in C and Perl

Created by Linus Torvalds

Free under the GNU GPL v2+ license

Page 11: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Common Features

Page 12: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Branching Strategies

Central

Feature

GitFlow

Page 13: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Central

One branch typically called Master or Trunk on Subversion

Changes are made then committed back to Master/Trunk branch

Page 14: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Feature

Features are developed on their own dedicated branch

Limits merges into the master/trunk branch until a feature is complete

Supports parallel feature implementation work

Page 15: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

GitFlowIntroduced by Vincent Driessen in his post

“A successful Git branching model”

Two long running branches called Master and Develop

Master is production ready and/or production deployed code

Develop is code ready for the next release

http://nvie.com/posts/a-successful-git-branching-model/
Page 16: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

GitFlow

Feature branches for separate feature development

Features can be long running branches or short lived small user stories

Release branches when in code freeze prior to an app release

Release branches are merged back to master and tagged

Hot fix branches off of tagged master commit then merged back in master when released

Page 17: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

GitFlow

Page 18: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

GitFlow

Page 19: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Real World Use Cases

Page 20: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Brent Simmons (@brentsimmons) write up via email

One single Subversion repository for everything(multiple products, shared frameworks, designs, docs, websites)

Repository is enormous. Moving from a central to distributed setup is unreasonable

Branches are created close to release to isolate shared framework code

Page 21: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

My Experience

Spent 7 years building desktop and services using Delphi and .Net

Used Visual Source Safe, SourceGear Vault and Team Foundation Server

Moved to Mercurial and BitBucket for Social Sites and Glassboard

Use Git and GitHub Today

Page 22: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

GitFlow With Feature TeamsTwo Permanent Branches - Master and Develop

Long Running Major Feature Branches

Release Branches During Code Freeze

Jira Stories in Single Feature Branch

Bugs In Single Bug fix Branch

Pull Request for Code Review Prior to Merge

Constant Merging Between Branches

Page 23: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Panelist

Page 24: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Copyright © 2015 Float Mobile Learning. All rights reserved.www.floatlearning.com

http://www.floatlearning.com
Page 25: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

NBA development

• Large and small releases, 1-2 per month• 3-6 developers working concurrently• github/pull requests• jira• jenkins CI

Page 26: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

git flow

Page 27: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

the workflow

• master - the historical branch• develop - work towards the next release contributed here

• feature branches - NBA-1234_Short_Description• branch from develop, merge into develop

• fix branches - EFIX_NBA-1234_Short_Description• branch from master, merge into master and develop

• release branches• branch from develop, merge into master and develop

Page 28: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

why git flow

• Parallel development• Simple to understand• Adaptable• Fits the pull request workflow• CI integration• Structured, Separation of concerns

Page 29: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

links

• http://nvie.com/posts/a-successful-git-branching-model/• https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/• https://github.com/nvie/gitflow

http://nvie.com/posts/a-successful-git-branching-model/
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/
https://github.com/nvie/gitflow
Page 30: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Panelist

Page 31: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Open Discussion

Page 32: Git It Together Discussing Source Control · GitFlow Introduced by Vincent Driessen in his post “A successful Git branching model” Two long running branches called Master and

Thanks!


Hurricane Analysis and Forecast System (HAFS): A UFS ...€¦ · A GitFlow branching strategy (from Vincent Driessen’s blog) Adopts the GitFlow rational ...

Hurricane Analysis and Forecast System (HAFS): A UFS ...€¦ · A GitFlow branching strategy (from Vincent Driessen’s blog) Adopts the GitFlow rational ...

Agility on Steroids with a Docker-based CI/CD pipeline on AWS · Dev Test Deploy Docker Docker Docker Gitflow Gitflow Gitflow CircleCI Volume Mounts S3 -KMS S3 -KMS AWS ECS Code Reviews

Agility on Steroids with a Docker-based CI/CD pipeline on AWS · Dev Test Deploy Docker Docker Docker Gitflow Gitflow Gitflow CircleCI Volume Mounts S3 -KMS S3 -KMS AWS ECS Code Reviews

Git & gitflow

Git & gitflow

Git-Workflows im Alltag - Chemnitzer Linux-Tage 2018 · PDF fileGitflow–pdftk gitflow.pdf cat 1E output gitflow-rotated.pdf 25 / 41. Gitflow–master unddevelop ZweilanglebigeBranches

Git-Workflows im Alltag - Chemnitzer Linux-Tage 2018 · PDF fileGitflow–pdftk gitflow.pdf cat 1E output gitflow-rotated.pdf 25 / 41. Gitflow–master unddevelop ZweilanglebigeBranches

Fighting Git Workflows · Centralized workflow, feature branch workflow, GitFlow, forking workflow, OneFlow, No flow ?! Oh my ! To rebase or not to rebase ? That is the question.

Fighting Git Workflows · Centralized workflow, feature branch workflow, GitFlow, forking workflow, OneFlow, No flow ?! Oh my ! To rebase or not to rebase ? That is the question.

Formation Git - lis-lab.fr · 2018-11-27 · GitFlow. Introduction. Introduction Ancêtres GNU RCS (Revision Control System) et diff: 1982 un fichier (source, binaire) à la fois

Formation Git - lis-lab.fr · 2018-11-27 · GitFlow. Introduction. Introduction Ancêtres GNU RCS (Revision Control System) et diff: 1982 un fichier (source, binaire) à la fois

Git Workflow With Gitflow

Git Workflow With Gitflow

GETTING TO KNOW GIT: PART II - Xojocdn.xojo.com/WebinarExamples/Xojo Webinar - Getting To Know Git... · • GitFlow is a popular branching model

GETTING TO KNOW GIT: PART II - Xojocdn.xojo.com/WebinarExamples/Xojo Webinar - Getting To Know Git... · • GitFlow is a popular branching model

Git Branching Model - nvie.com · Title: A successful Git branching model Author: Vincent Driessen (@nvie) Keywords: git, branching, model, gitflow, nvie, Vincent, Driessen, blog,

Git Branching Model - nvie.com · Title: A successful Git branching model Author: Vincent Driessen (@nvie) Keywords: git, branching, model, gitflow, nvie, Vincent, Driessen, blog,

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdfTitle: 2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdfTitle: 2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past

Git and Gitflow tutorial

Git and Gitflow tutorial

A simplified Gitflow

A simplified Gitflow

Geert Driessen (2008) M&M De verwachtingen waargemaakt?

Geert Driessen (2008) M&M De verwachtingen waargemaakt?

UvA-DARE (Digital Academic Repository) The gross and net … · Geert Driessen, Orhan Agirdag & Michael S. Merry . Corresponding author: Geert Driessen . ITS . Radboud University

UvA-DARE (Digital Academic Repository) The gross and net … · Geert Driessen, Orhan Agirdag & Michael S. Merry . Corresponding author: Geert Driessen . ITS . Radboud University

Customer conversations - by Simone Driessen

Customer conversations - by Simone Driessen

Intro to Gitflow

Intro to Gitflow

Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Michael Driessen - Georgetown University

Michael Driessen - Georgetown University

CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

Vom Papier zur normkonformen Mobile Medical App Ein ...€¦ · structure (if gitflow is used) independent versioning of app and cloud independent (linked) git repositories. development

Vom Papier zur normkonformen Mobile Medical App Ein ...€¦ · structure (if gitflow is used) independent versioning of app and cloud independent (linked) git repositories. development