Branch branch branch then rebase - a git workflow

A git workflow that avoids most merge conflicts, gives a logical and clean commit log and lets you push working code.

Speaker(s)

Fredrik Jonsson
Developer
Combonetwork development
Drupal user: frjo