Semantic Conflict and the problem of Feature Branching

Sit around and listen as I make a fool of myself discussing a recent article by Martin Fowler regarding the problem of Semantic Conflict when using Feature Branches.