Workflow Strategy: Starting with a Merge Product and Extracting into Branches

1min Snip

00:00

Play full episode

Summary

Transcript

Episode notes

The approach described is akin to integration work where multiple branches are merged into one working directory to test together. In this case, the process is reversed by starting with a merged product and then extracting changes into separate reviewable branches. This method ensures that all branches will merge smoothly without conflicts as changes are divided into parallel branches, creating a clean workflow and allowing for a cohesive end result.

This week we’re talking to Scott Chacon, one of the co-founders of GitHub, to discuss the history and future of Git and Scott’s new project Git Butler, a branch manager tool that’s aiming to improve the developer experience of Git using Git. We also touch on the contentious topic of open source licensing and the challenges of defining “Open Source”, FSL vs GPL, and more.

Leave us a comment

Changelog++ members save 2 minutes on this episode because they made the ads disappear. Join today!

Sponsors:

FireHydrant – The alerting and on-call tool designed for humans, not systems. Signals puts teams at the center, giving you ultimate control over rules, policies, and schedules. No need to configure your services or do wonky work-arounds. Signals filters out the noise, alerting you only on what matters. Manage coverage requests and on-call notifications effortlessly within Slack. But here’s the game-changer…Signals natively integrates with FireHydrant’s full incident management suite, so as soon as you’re alerted you can seamlessly kickoff and manage your entire incident inside a single platform. Learn more or switch today at firehydrant.com/signals
CrabNebula Cloud – CrabNebula Cloud is here! Distribute Tauri apps and Electron apps with best in class updater. At the heart of CrabNebula Cloud is a purpose-built CDN ready for global scale, and secure updates as a first-class citizen. Learn more at crabnebula.dev/cloud
Coda – Your all-in-one collaborative workspace. Coda brings teams and tools together for a more organized work day.
Fly.io – The home of Changelog.com — Deploy your apps and databases close to your users. In minutes you can run your Ruby, Go, Node, Deno, Python, or Elixir app (and databases!) all over the world. No ops required. Learn more at fly.io/changelog and check out the speedrun in their docs.