Git Flow Tutorial

Git-flow스마트한 브랜칭 전략과 릴리즈 관리

index

why

install

git-flow

Software Development Life-Cycle

Planning Development Testing Release

Software Development Life-Cycle

Start

Target

solo

Start

Target

httpwwwmongricokrxe319

we are the team

Start

Target

httpwwwmongricokrxe319

go to hell

삼천포로13

Start

Target목표보다13 앞선

기능13 구현

기능13 구현

기능13 구현

go to hell

삼천포로13

Start

Target목표보다13 앞선

기능13 구현

기능13 구현

기능13 구현

result

dirty

no plan

no maintenance

Tim

e

release13

branches masterdevelop hotfixesfeature13

branches

Feature13 for13 future13 release

Tag10

Major13 feature13 for13 next13 release

From13 this13 point13 on13 ldquonext13 releaserdquo13 means13 the13

release13 after13 10

Severe13 bug13 fixed13 for13 production

hotfix13 02

Bugfixes13 from13 rel13 branch13 may13

be13 continuously13 merged13 back13 into13 develop

Tag01

Tag02

Incorporate13 bugfix13 in13 develop

Only13 bugfixes

Start13 of13 release13 branch13 for

10

result

beautiful

have plan

efficiently maintenance

more

Feature13 브랜치v010

Develop13 변경13 이력병합

Develop13 변경13 이력병합

Tim

e

release branches masterdevelop hotfixes

HeroChatServer

v01013 릴리즈13 태깅서비스13 릴리즈

초기13 태깅

작업13 분리전13 태깅중요한13 시점

Release13 브랜치v010

HeroChatClient

H3 SiteUI

Release13 브랜치v020

릴리즈13 브랜치v030

emergency

Planning Development Testing Release

Problem

Release13 브랜치v011

v01013 릴리즈13 태깅서비스13 릴리즈

사전13 등록13 버튼13 마크업13 크로스13 브라우징13 에러

Tim

e

release branches masterdevelop hotfixes

HeroChatServer

초기13 태깅

HeroChatClient

H3 SiteUI

v01113 hotfix13 태깅후13 서비스13 릴리즈

install

$ brew install git

git clone httpsgithubcomnviegitflowgit

Git-flow

shell script for git

smart branching strategy for git

Vincent Driessenrsquos branching model

source httpsgithubcomnviegitflow

git init - initialization

$ mkdir git-flow-edu

$ cd git-flow-edu

~pathtogit-flow-edu$ git init

Initialized empty Git repository in pathtogit-flow-edugit

git flow help

usage git flow ltsubcommandgt

Available subcommands are init Initialize a new git repo with support for the branching model feature Manage your feature branches release Manage your release branches hotfix Manage your hotfix branches support Manage your support branches version Shows version information

Try git flow ltsubcommandgt help for details

git flow init$ mkdir git-flow-edu

$ cd git-flow-edu

~pathtogit-flow-edu$ git flow initInitialized empty Git repository in pathtogit-flow-edugitNo branches exist yet Base branches must be created nowBranch name for production releases [master] Branch name for next release development [develop]

How to name your supporting branch prefixesFeature branches [feature] Release branches [release] Hotfix branches [hotfix] Support branches [support] Version tag prefix []

git flow feature

base develop

~pathtogit-flow-edu$ git flow feature start ltnamegt [ltbasegt]

~pathtogit-flow-edu$ git flow feature finish ltnamegt

git flow feature help

usage git flow feature [list] [-v] git flow feature start [-F] ltnamegt [ltbasegt] git flow feature finish [-rFk] ltname|nameprefixgt git flow feature publish ltnamegt git flow feature track ltnamegt git flow feature diff [ltname|nameprefixgt] git flow feature rebase [-i] [ltname|nameprefixgt] git flow feature checkout [ltname|nameprefixgt] git flow feature pull ltremotegt [ltnamegt]

git flow release

base develop

~pathtogit-flow-edu$ git flow release start ltreleasegt [ltbasegt]

~pathtogit-flow-edu$ git flow release finish ltreleasegt

git flow release help

usage git flow release [list] [-v] git flow release start [-F] ltversiongt git flow release finish [-Fsumpk] ltversiongt git flow release publish ltnamegt git flow release track ltnamegt

git flow hotfix

base master

~pathtogit-flow-edu$ git flow hotfix start ltreleasegt [ltbasegt]

~pathtogit-flow-edu$ git flow hotfix finish ltreleasegt

git flow hotfix help

usage git flow hotfix [list] [-v] git flow hotfix start [-F] ltversiongt [ltbasegt] git flow hotfix finish [-Fsumpk] ltversiongt

git flow support

Experimental

references

httpjeffkreeftmeijercom2010why-arent-you-using-git-flow

httpsgithubcomnviegitflow

other toolsgit-extra high-level utilities for git httpsgithubcomrhiokimgit-extras

gitlab free ProjectRepository management application httpsgithubcomsitaramcgitolite

gitolite hosting Git repositories easily and securely httpsgithubcomsitaramcgitolite

git-diff-grep Run grep across git diffs history httpsgithubcomoscardelbengit-diff-grep

gerrit Web based code review system httpcodegooglecompgerrit

Start