From 456fe1abed4f689dd1e78a7bf9dd462c73a604fa Mon Sep 17 00:00:00 2001 From: Ian Hickson Date: Thu, 8 Jul 2021 15:11:05 -0700 Subject: [PATCH] Prevent merge conflicts when running customer tests. (#86063) --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4a839b20762..2433c6df473 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -154,7 +154,6 @@ task: # otherwise we won't be able to figure out how old or new our current branch is. - git config user.email "cirrus-bot@invalid" - git fetch origin master:master - - git rebase master # The actual logic is in a shell script so that it can be shared between CIs. - (cd dev/customer_testing/; ./ci.sh)