Merge pull request #315 from jakirkham/drop_extra_checkout

Drop extra PR merge ref checkout on CircleCI
conda-forge · Sep 29, 2016 · 8177e92 · 8177e92
2 parents 4ddd4fe + 999b1bf
commit 8177e92
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/conda_smithy/feedstock_content/ci_support/checkout_merge_commit.sh b/conda_smithy/feedstock_content/ci_support/checkout_merge_commit.sh
@@ -23,6 +23,5 @@ fi
 # Check for merge conflicts.
 if [[ -n "${CIRCLE_PR_NUMBER}" ]]
 then
-    git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge"
     git branch --merged | grep "pr/${CIRCLE_PR_NUMBER}/head" > /dev/null
 fi