github_merge: use combined status (and be more useful)