We don't allow stale merges so each branch must be fully up to date with master before it can be metged.

This is a bit of a pain in busy repos