Working on Puppet always is fun. But working with GIT is hard for many people who are new to GIT. Within this talk I will show why a single long living branch (production) makes sense for most installations. I will show how you bring changes into your environment by using feature branches. But what happens if you are in a more ITIL based environment. In this case it might be required to have several long living branches like production, testing, development. How do you now bring individual changes into production and how to backport hotfixes into development. This is the situation where you want to consider following the GIT Flow concept. I will explain when and how to make use of which concept and what are the main differences and challenges.
Puppet Control-Repo
Simple GIT
Staging Branches
GIT Flow
Speaker:
Martin Alfke, CEO, Example42