Git workflow

Always use a dedicated branch when working on the Puppet repository. This branch will corespond to an environment in Puppet. The main environment is production and this corresponds to the master branch in the Puppet repo. All other environments will be named after your branch name.

caution

Make sure to use a branch name that is a valid Puppet environment name: It must contain only lowercase letters, numbers and underscore. You can use this git hook to prevent pushing invalid branch names.

When you are finished with your code and has tested it as described below it is encouraged to:

• Rebase your code into a meaningful set of commits to remove any noise from fixing errors, experimenting back and forth, etc
• Ask for a code review for all non-trivial changes

When this is done you can merge your branch into master.