From 52cecd5565b3225cc8bdfe9ac30ea13f0015c4ec Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen <louistw@uab.edu> Date: Thu, 8 Sep 2022 11:09:52 -0500 Subject: [PATCH] Fix branch name for merge with remote name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c90044..4bd2318 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,7 @@ setup_environment: fi - > git checkout -b integration; - git merge uab-dev; + git merge origin/uab-dev; cd ..; - s3cmd get --force --host=$AWS_HOST --host-bucket=$AWS_HOST s3://ood-config/group_vars/all CRI_XCBC/group_vars/all - s3cmd get --force -r --host=$AWS_HOST --host-bucket=$AWS_HOST s3://cheaha-cloud-ansible-files/ ansible/files/ -- GitLab