Slide 1

Slide 1 text

TRUNK-BASED DEVELOPMENT BRANCHING OFF FROM BUREAUCRACY

Slide 2

Slide 2 text

TRUNK-BASED DEVELOPMENT TRUNK-BASED? ALSO KNOWN AS ▸ Master-Based ▸ Single Branch CONTRASTED WITH ▸ Gitflow ▸ GitHub Flow

Slide 3

Slide 3 text

FEATURE BRANCHING IS A POOR MAN’S MODULAR ARCHITECTURE… Daniel Worthington-Bodart TRUNK-BASED DEVELOPMENT

Slide 4

Slide 4 text

TRUNK-BASED DEVELOPMENT DIFFERENT TYPES OF PROJECTS TEAM SIZE ROLES TRUST WORKFLOW LIFE CYCLE

Slide 5

Slide 5 text

TRUNK-BASED DEVELOPMENT DIFFERENT TYPES OF PROJECTS BAZAAR CATHEDRAL TEAM SIZE ROLES TRUST WORKFLOW LIFE CYCLE

Slide 6

Slide 6 text

TRUNK-BASED DEVELOPMENT DIFFERENT TYPES OF PROJECTS Unlimited Limited TEAM SIZE ROLES TRUST WORKFLOW LIFE CYCLE BAZAAR CATHEDRAL

Slide 7

Slide 7 text

TRUNK-BASED DEVELOPMENT DIFFERENT TYPES OF PROJECTS Unlimited Limited TEAM SIZE ROLES TRUST WORKFLOW LIFE CYCLE BAZAAR CATHEDRAL Loose Precise

Slide 8

Slide 8 text

TRUNK-BASED DEVELOPMENT DIFFERENT TYPES OF PROJECTS Unlimited Limited TEAM SIZE ROLES TRUST WORKFLOW LIFE CYCLE BAZAAR CATHEDRAL Loose Low Precise High

Slide 9

Slide 9 text

TRUNK-BASED DEVELOPMENT DIFFERENT TYPES OF PROJECTS Unlimited Limited TEAM SIZE ROLES TRUST WORKFLOW LIFE CYCLE BAZAAR CATHEDRAL Loose Low Asynchronous Precise High Synchronous

Slide 10

Slide 10 text

TRUNK-BASED DEVELOPMENT DIFFERENT TYPES OF PROJECTS Unlimited Limited TEAM SIZE ROLES TRUST WORKFLOW LIFE CYCLE BAZAAR CATHEDRAL Loose Low Asynchronous Complex Precise High Synchronous Streamlined

Slide 11

Slide 11 text

TRUNK-BASED DEVELOPMENT

Slide 12

Slide 12 text

TRUNK-BASED DEVELOPMENT EMBRACE CATHEDRAL TO THE EXTREME ▸ Do not postpone what you can do now ▸ Pair programming ▸ Test-first approach ▸ CI with feature toggles ▸ Code review ▸ Waiting for incidents ▸ Feature branching INSTEAD OF

Slide 13

Slide 13 text

TRUNK-BASED DEVELOPMENT EMBRACE CATHEDRAL TO THE EXTREME ▸ Do not postpone what you can do now ▸ Pair programming ▸ Test-first approach ▸ CI with feature toggles ▸ Code review ▸ Waiting for incidents ▸ Feature branching INSTEAD OF

Slide 14

Slide 14 text

TRUNK-BASED DEVELOPMENT EMBRACE CATHEDRAL TO THE EXTREME ▸ Do not postpone what you can do now ▸ Pair programming ▸ Test-first approach ▸ CI with feature toggles ▸ Code review ▸ Waiting for incidents ▸ Feature branching INSTEAD OF

Slide 15

Slide 15 text

TRUNK-BASED DEVELOPMENT EMBRACE CATHEDRAL TO THE EXTREME ▸ Do not postpone what you can do now ▸ Pair programming ▸ Test-first approach ▸ CI with feature toggles ▸ Code review ▸ Waiting for incidents ▸ Feature branching INSTEAD OF

Slide 16

Slide 16 text

TRUNK-BASED DEVELOPMENT EMBRACE CATHEDRAL TO THE EXTREME ▸ Do not postpone what you can do now ▸ Pair programming ▸ Test-first approach ▸ CI with feature toggles ▸ Code review ▸ Waiting for incidents ▸ Feature branching INSTEAD OF

Slide 17

Slide 17 text

TRUNK-BASED DEVELOPMENT EMBRACE CATHEDRAL TO THE EXTREME ▸ Do not postpone what you can do now ▸ Pair programming ▸ Test-first approach ▸ CI with feature toggles ▸ Code review ▸ Waiting for incidents ▸ Feature branching INSTEAD OF

Slide 18

Slide 18 text

TRUNK-BASED DEVELOPMENT WHAT ARE YOU WAITING FOR? ▸ Practices named and described one decade ago ▸ Nothing changed validity their validity ▸ Question your process from time to time