Are we warning against multiple sources of truth?

See ga-wdi-boston/browser-template#96

Some developers merged features locally and on github.  The github merge creates a merge commit by default so the histories can't match.