Mastering Puppet 5

Merging branches

In our earlier steps, we isolated our working code into a feature-branch and a short-lived, non-production environment. While teams and organizations should select some merging safeguards and strategies, such as peer code reviews and automated testing, this section will focus on the steps required to merge branches into master or long-lived branches in Puppet. Enterprise and open source web-based Git solutions usually contain some extra controls to indicate who can merge into a repository, and to which branches. The general best practice is to allow for a peer review of code, and the reviewer can accept the code into the long-lived branch or master branch. Merging our code via the command line is a simple process, as follows: ...