|
@@ -14,7 +14,7 @@ if [[ -n "${PULL_REQUEST_ID}" ]]; then
|
|
git fetch --unshallow
|
|
git fetch --unshallow
|
|
git fetch origin "pull/${PULL_REQUEST_ID}/head"
|
|
git fetch origin "pull/${PULL_REQUEST_ID}/head"
|
|
git checkout FETCH_HEAD
|
|
git checkout FETCH_HEAD
|
|
- git merge --no-edit "origin/${BRANCH_NAME}"
|
|
|
|
|
|
+ git merge --no-commit "origin/${BRANCH_NAME}"
|
|
fi
|
|
fi
|
|
|
|
|
|
if [[ -z "${RELEASE_VERSION}" ]]; then
|
|
if [[ -z "${RELEASE_VERSION}" ]]; then
|