Over a million developers have joined DZone.

The Ship Show: Branching, Merging, and Octopi (Oh My!)

DZone's Guide to

The Ship Show: Branching, Merging, and Octopi (Oh My!)

· DevOps Zone
Free Resource

The DevOps Zone is brought to you in partnership with Sonatype Nexus. The Nexus Suite helps scale your DevOps delivery with continuous component intelligence integrated into development tools, including Eclipse, IntelliJ, Jenkins, Bamboo, SonarQube and more. Schedule a demo today

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 Git's free-for-all merge process can leave your organization with (mostly by being totally silent on the subject) code that is error-prone and 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!

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!

The DevOps Zone is brought to you in partnership with Sonatype Nexus. Use the Nexus Suite to automate your software supply chain and ensure you're using the highest quality open source components at every step of the development lifecycle. Get Nexus today


Published at DZone with permission of Paul Reed, DZone MVB. See the original article here.

Opinions expressed by DZone contributors are their own.


Dev Resources & Solutions Straight to Your Inbox

Thanks for subscribing!

Awesome! Check your inbox to verify your email so you can start receiving the latest in tech news and resources.


{{ parent.title || parent.header.title}}

{{ parent.tldr }}

{{ parent.urlSource.name }}