A Branching Strategy For You?


Wednesday 18th,

10:45 a.m. – 11:30 a.m.


Talks (Track 1) – Main Stage at the Beach

Session Type

25-minute Talk,

Advanced session


Automation Engineers, DevOps Engineers, Developers, Architects


  • Explain what Git is
  • Recall what a branch is
  • Evaluate which branching strategy might be the best fit for you

Experience report about the world's top most used Git branching strategies.

In today’s world of CI/CD pipelines where new versions of our production and test code has to be checked out at speed multiple times per day, it matters which branching strategy your team chooses. Git is probably the most well known and used version control system world wide these days. In this talk I am going to share with you some of my personal experiences I have collected over the past couple of years in using Git. I will have a look at some of today's top most used real world branching strategies, so that you afterwards will be able to choose the one which fits the most into your unique context. To round this session up, I will give you some hacking advice to the often asked questions: Why is the master branch called master branch in Git? Why did GitHub get away from this naming convention? And, can we change the name of an already existing master branch in our project?

More Related Sessions

  • Talk
  • Workshop
  • Bonus
  • Keynote
  • Social

25-minute Talk

1:15 p.m. – 2:00 p.m. Talks (Track 1) – Main Stage at the Beach

25-minute Talk

1:15 p.m. – 2:00 p.m. Talks (Track 1) – Main Stage at the Beach

25-minute Talk

11:45 a.m. – 12:30 p.m. Talks (Track 2) – Indoor Hall