Git is not just a version control system. Git can change the way you interact with your team members. Lot’s of teams don’t think about reflecting their development workflow in Git and just use it out-of-the-box. Git, however, can be much more powerful, giving your team a boost in productivity, protecting your delivery pipeline and helping you to work better together.
In this session we will start with a central workflow that is used by a lot of Subversion teams. You will learn how to practically integrate ALM solutions like continuous deployment, code reviews, change tracking and much more into your individual workflow. You will find out how to protect your master branch from accidental commits, broken builds and unreviewed code. This presentation will help you discover the best way to work together as a team – whether you’re yet to migrate to Git or even an experienced Git user.
8. WHY IS
GIT
GOOD*?
CHEAP BRANCHING
EVERYTHING IS LOCAL
GIT IS FAST
GIT IS SMALL
THE STAGING AREA
DISTRIBUTED
GITHUB & BITBUCKET
GIT IS THE NEW STANDARD
HUGE COMMUNITY
* from Lemi Orhan Ergin
9. WHY IS
GIT
GOOD*?
CHEAP BRANCHING
EVERYTHING IS LOCAL
GIT IS FAST
GIT IS SMALL
THE STAGING AREA
DISTRIBUTED
GITHUB & BITBUCKET
WORKFLOW CAPABILITIES
GIT IS THE NEW STANDARD
HUGE COMMUNITY
* from Lemi Orhan Ergin
16. Can we do a fast
Can we fix a bug for the upcoming
RELEASE ?
HOTFIX for the current version?
Can we
BUILD the current code ?
Is the code for that
FEATUREcomplete?
Has everybody
REVIEWED the code for this feature ?
17. I FIND YOUR LACK OF
WORKFLOW STRUCTURE
DISTURBING
28. MAKES A COPY OF A REPOSITORY ON THE SERVER
YOU CAN NOT WRITE DIRECTLY TO THE ORIGINAL REMOTE REPOSITORY
YOU CAN STILL GET CHANGES FROM THE ORIGINAL REMOTE REPOSITORY
forking rocks!
115. DEVELOP & MASTER BRANCH
THE GITFLOW
from Vincent Driessen
FEATURE BRANCHES
RELEASE BRANCHES
MAINTENANCE BRANCHES
116. HOW CAN I FIND MY WAY THROUGH THE
RULE JUNGLE?
USE T
OOLS
117. HOW CAN I REMEMBER ALL THESE
GIT COMMANDS AND RULES?
git flow feature start 'JRA-34 Add User'
git flow feature finish 'JRA-34 Add User'
git flow release start 1.6
git flow hotfix finish 1.5.3
there is a command line tool
118. HOW CAN I REMEMBER ALL THESE
GIT COMMANDS AND RULES?
178. GIT WORKFLOW
'START PROGRESS' ON AN ISSUE CREATES A FEATURE BRANCH
DOING A PULL REQUEST MARKS THE ISSUE 'IN REVIEW'
MERGING A FEATURE BRANCH MARKS THE ISSUE AS 'RESOLVED'
179. ISSUE WORKFLOW
'START PROGRESS' ON AN ISSUE CREATES A FEATURE BRANCH
DOING A PULL REQUEST MARKS THE ISSUE 'IN REVIEW'
MERGING A FEATURE BRANCH MARKS THE ISSUE AS 'RESOLVED'
180. 'START PROGRESS' ON AN ISSUE CREATES A FEATURE BRANCH
DOING A PULL REQUEST MARKS THE ISSUE 'IN REVIEW'
MERGING A FEATURE BRANCH MARKS THE ISSUE AS 'RESOLVED'
181. GIT COMBINED ISSUE WORKFLOW
'START PROGRESS' ON AN ISSUE CREATES A FEATURE BRANCH
DOING A PULL REQUEST MARKS THE ISSUE 'IN REVIEW'
MERGING A FEATURE BRANCH MARKS THE ISSUE AS 'RESOLVED'