with --pull switch, handle exiting only if pull needs a merge, let continue instead