115: Infernal Loop of Conflict Resolution

Download

Yanik compares branches and feature flags, and thinks out loud about monorepos.

Related Links

• Admin note: In two months, we will be recording an episode about our first time playing through the Midgar section of Final Fantasy VII. Feel free to play along at home!
• FU: YouTube/Nintendo Mobile: Welcome to Dr. Mario World
• Wikipedia: Branching (version control)
• Vincent Driessen: A successful Git branching model, the article that gave us git-flow
• Wikipedia: Feature toggle
• Wikipedia: Monorepo
• Facebook's Buck build tool, tailored for monorepos