From a457a26d8fb60d1abe37facf8aa10f2ad100825b Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Tue, 16 Jan 2024 20:26:41 +0000 Subject: [PATCH] Put back deleted code --- buildkite/scripts/merges-cleanly.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildkite/scripts/merges-cleanly.sh b/buildkite/scripts/merges-cleanly.sh index 8531620275e..8743b4e3af9 100755 --- a/buildkite/scripts/merges-cleanly.sh +++ b/buildkite/scripts/merges-cleanly.sh @@ -12,6 +12,9 @@ echo 'Testing for conflicts between the current branch `'"${CURRENT}"'` and `'"$ # Tell git where to find ssl certs git config --global http.sslCAInfo /etc/ssl/certs/ca-bundle.crt +# Fetch a fresh copy of the repo +git fetch origin + source buildkite/scripts/handle-fork.sh git config --global user.email "hello@ci.com"