September, 2013


19
Sep 13

Branching, Merging, and Octopi (Oh My!)

With the explosion in popularity and usage of Git and its distributed version control brethren, developers finally have cheap, easy, local branching. But branching is pointless without merging, and many organizations are finding that the free-for-all merge process that Git can leave your organization with (mostly by being totally silent on the subject) is error prone, doesn’t scale, and may even destroy content! As you search for the perfect branching model, questions like “should we use fast-forward merges or merge commits,” “When do we rebase (if ever)?” and “What repository structure should we use” are bound to crop up, along with “can’t we just use git flow?” Join the panel as they grab a razor and a yak and talk:

Branching, Merging, and Octopi (Oh My!)

Join J. Paul Reed, aka @SoberBuildEng, Youssuf El-Kalay, aka @buildscientist, EJ Ciramella, aka @eciramella, Sascha Bates, aka @sascha_d, and Seth Thomas, aka @cheeseplus plus the last couple of weeks in News & Views and a Tool Tip!

Or, download Episode 27, or any of our previous shows!

Show Links/Notes

Tool Tip

Paul reviews Storm, a tool to “manage your SSH like a boss!”

Join Us!

What branching and merging models do you like? Which ones do you despise?

Or do you just hope you don’t have to worry about any of it?

Join the discussion!


3
Sep 13

PuppetConf 2013 Revue

All of Information Technology’s puppeteers recently came together in San Francisco to discuss their beloved automation/configuration management tool, Puppet! We attended the conference and have the lowdown on all the Puppet developments of the past year, plus what’s in store for Puppet and the community this next year! Join our eclectic panel of puppet experts as we recount the goings on this year at PuppetConf in our:

PuppetConf 2013 Revue

Join J. Paul Reed, aka @SoberBuildEng, Youssuf El-Kalay, aka @buildscientist, and EJ Ciramella, aka @eciramella plus the last couple of weeks in News & Views and the return of the word association game!

Or, download Episode 26, or any of our previous shows!

Show Links/Notes

Roaming PuppetConf Word Association Game

The conference word association game returns!

Just as at ChefConf, we asked a number of PuppetConf attendees to blurt out the first word that came into their head when prompted by a number of words relevant to our industry.

See what they had to say!

Join Us!

Did you attend PuppetConf? Or watch the live stream?

Where do you think Puppet is going in the next year?

Join the discussion!