Slide 1

Slide 1 text

flow Gabriel Zigolis

Slide 2

Slide 2 text

GIT-FLOW GIT-FLOW ARE A SET OF GIT EXTENSIONS TO PROVIDE HIGH- LEVEL REPOSITORY OPERATIONS FOR VINCENT DRIESSEN'S BRANCHING MODEL. HTTP://DANIELKUMMER.GITHUB.IO/GIT-FLOW-CHEATSHEET/

Slide 3

Slide 3 text

CLI GIT FLOW PROVIDES EXCELLENT COMMAND LINE HELP AND OUTPUT. READ IT CAREFULLY TO SEE WHAT'S HAPPENING...

Slide 4

Slide 4 text

GUI THE OSX/WINDOWS CLIENT SOURCETREE IS AN EXCELLENT GIT GUI AND PROVIDES GIT-FLOW SUPPORT.

Slide 5

Slide 5 text

SETUP YOU NEED A WORKING GIT INSTALLATION AS PREREQUISITE. $ BREW INSTALL GIT-FLOW $ APT-GET INSTALL GIT-FLOW OSX LINUX $ WGET -Q -O - --NO-CHECK-CERTIFICATE HTTPS://GITHUB.COM/NVIE/GITFLOW/RAW/ DEVELOP/CONTRIB/GITFLOW-INSTALLER.SH | BASH BADWINDOWS

Slide 6

Slide 6 text

GETTING STARTED YOU'LL HAVE TO ANSWER A FEW QUESTIONS REGARDING THE NAMING CONVENTIONS. $ GIT FLOW INIT START USING GIT-FLOW BY INITIALIZING IT INSIDE AN EXISTING GIT REPOSITORY:

Slide 7

Slide 7 text

START A NEW FEATURE THIS ACTION CREATES A NEW FEATURE BRANCH BASED ON 'DEVELOP' AND SWITCHES TO IT. $ GIT FLOW FEATURE START MYFEATURE DEVELOPMENT OF NEW FEATURES STARTING FROM THE 'DEVELOP' BRANCH.

Slide 8

Slide 8 text

PUBLISH A FEATURE $ GIT FLOW FEATURE PUBLISH MYFEATURE PUBLISH A FEATURE TO THE REMOTE SERVER SO IT CAN BE USED BY OTHER USERS.

Slide 9

Slide 9 text

FINISH UP A FEATURE *MERGED MYFEATURE INTO ‘DEVELOP' / *REMOVES THE FEATURE BRANCH / *SWITCHES BACK TO 'DEVELOP' BRANCH $ GIT FLOW FEATURE FINISH MYFEATURE FINISH THE DEVELOPMENT OF A FEATURE. THIS ACTION PERFORMS THE FOLLOWING. $ GIT PUSH ORIGIN :FEATURE/MYFEATURE

Slide 10

Slide 10 text

START A RELEASE YOU CAN OPTIONALLY SUPPLY A [BASE] COMMIT SHA-1 HASH TO START THE RELEASE FROM. $ GIT FLOW RELEASE START MYRELEASE USE THE GIT FLOW RELEASE COMMAND. IT CREATES A RELEASE BRANCH CREATED FROM THE 'DEVELOP' BRANCH.

Slide 11

Slide 11 text

PUBLISH A RELEASE $ GIT FLOW RELEASE PUBLISH MYRELEASE IT'S WISE TO PUBLISH THE RELEASE BRANCH AFTER CREATING IT TO ALLOW RELEASE COMMITS BY OTHER DEVELOPERS.

Slide 12

Slide 12 text

FINISH UP A RELEASE DON'T FORGET TO PUSH YOUR TAGS WITH GIT PUSH --TAGS $ GIT FLOW RELEASE FINISH MYRELEASE FINISHING A RELEASE IS ONE OF THE BIG STEPS IN GIT BRANCHING. $ GIT PUSH ORIGIN :RELEASE/MYRELEASE

Slide 13

Slide 13 text

FINISH UP A RELEASE - MERGES THE RELEASE BRANCH BACK INTO 'MASTER' - TAGS THE RELEASE WITH ITS NAME - BACK-MERGES THE RELEASE INTO 'DEVELOP' - REMOVES THE RELEASE BRANCH

Slide 14

Slide 14 text

START A HOTFIX THE VERSION ARGUMENT HEREBY MARKS THE NEW HOTFIX RELEASE NAME. $ GIT FLOW HOTFIX START MYHOTFIX LIKE THE OTHER GIT FLOW COMMANDS, A HOTFIX IS STARTED WITH

Slide 15

Slide 15 text

FINISH UP A HOTFIX $ GIT FLOW HOTFIX FINISH MYHOTFIX BY FINISHING A HOTFIX IT GETS MERGED BACK INTO DEVELOP AND MASTER. ADDITIONALLY THE MASTER MERGE IS TAGGED WITH THE HOTFIX VERSION.

Slide 16

Slide 16 text

No content