From a818535cfc01bb6df82cff2ba7892f168c4d819d Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 18 Apr 2019 16:37:00 -0700 Subject: [PATCH] Merge pull requests instead of rebase [CI SKIP] --- windows/clone-pull-request.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/clone-pull-request.ps1 b/windows/clone-pull-request.ps1 index 3d2f44a..3cebaaf 100644 --- a/windows/clone-pull-request.ps1 +++ b/windows/clone-pull-request.ps1 @@ -13,4 +13,4 @@ git fetch $FLAGS origin "+refs/heads/${Env:DRONE_COMMIT_BRANCH}:" git checkout $Env:DRONE_COMMIT_BRANCH git fetch origin "${Env:DRONE_COMMIT_REF}:" -git rebase $Env:DRONE_COMMIT_SHA +git merge $Env:DRONE_COMMIT_SHA