GitFlow and You

Or: How I Learned to Stop Worrying and Love the Branch

This is a talk I gave to the Dallas PHP meetup about GitFlow, a methodology for managing your branches in git.

Most of us have used git to varying degrees, but what workflow do you use? Whether you’re working alone or with dozens of other developers, using the GitFlow workflow will make development and collaboration tracking easier than ever.

In addition to GitFlow specifics, this presentation will introduce you to some git commands and tactics that you may not have known about (or may have used incorrectly, to the detriment of your codebase).

Download the original PowerPoint (with animation!) from Drive: https://goo.gl/ZU7eDu

Transcript

1. GitFlow and You Or: How I Learned to Stop Worrying and Love the Branch Jake Bathman PHP Engineer @ Axxess @jakebathman
2. What is it? • Two permanent branches – master – develop • Ephemeral branches – feature – release – hotfix
3. What is it? Basic rules to follow 1. Never talk about git-flow 2. master is never directly modified 3. develop is never directly modified 4. features branch from develop 5. releases branch from develop 6. hotfixes branch from master
4. How does it work? Source: http://nvie.com
5. How does it work? master develop feature hotfix release v1.0.0 v1.2.0 v1.2.1 feature/foo tags
6. How does it work? Long life Short life Bleeding-edge Production-ready master release develop feature hotfix
7. What is it not? • Perfect • Best for all projects and teams – Deploying often? – Love committing to master? • Linear git history • Without rules and structure • Easy to remember without some help
8. A few more details • git rebase is your friend – rebase all feature branches on develop as often as necessary, but at least before finishing the branch • Always merge using --no-ff – This preserves the branch history after merging Source: http://nvie.com
9. Resources • https://blog.axosoft.com/2017/01/31/gitflow/ • https://www.atlassian.com/git/tutorials/comparing-workflows • Shell plugin: https://github.com/petervanderdoes/gitflow-avh • Counter-argument: http://endoflineblog.com/gitflow- considered-harmful