From f98e198dcf0322720ffb9f9bec5ff038d7757b0e Mon Sep 17 00:00:00 2001
From: axleiro <83293196+axleiro@users.noreply.github.com>
Date: Wed, 8 Dec 2021 13:43:59 +0530
Subject: [PATCH] resolving buildkite pull before push issue

Added:
git config pull.rebase false
git pull origin master --allow-unrelated-histories
---
 ci/dependabot-pr.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/dependabot-pr.sh b/ci/dependabot-pr.sh
index 769dc33cf..3ce48fe52 100755
--- a/ci/dependabot-pr.sh
+++ b/ci/dependabot-pr.sh
@@ -25,12 +25,13 @@ api_base="https://api.github.com/repos/solana-labs/solana/pulls"
 pr_num=$(echo "$BUILDKITE_BRANCH" | grep -Eo '[0-9]+')
 branch=$(curl -s "$api_base/$pr_num" | python3 -c 'import json,sys;print(json.load(sys.stdin)["head"]["ref"])')
 
-git pull
 git add :**/Cargo.lock
 EMAIL="dependabot-buildkite@noreply.solana.com" \
   GIT_AUTHOR_NAME="$name" \
   GIT_COMMITTER_NAME="$name" \
   git commit -m "[auto-commit] Update all Cargo lock files"
+git config pull.rebase false
+git pull origin master --allow-unrelated-histories
 git push origin "HEAD:$branch"
 
 echo "Source branch is updated; failing this build for the next"