Only check for upstream merges if not fast-forwarding