Fixed merge conflict with master
@@ -53,14 +53,14 @@ function deploy-to-svc() {
git commit -am "Deployed ${current_version} ${SKIP_CI_COMMIT_PHRASE}" --allow-empty
git push ${REMOTE_NAME} ${PROD_BRANCH}
git tag "${current_version}" && git push ${REMOTE_NAME} "${current_version}"
- git log --graph --all --oneline -n 10
+ git -c color.status=always log --all --decorate --oneline --graph -n 50
git fetch --all --prune
git gc --aggressive --prune=now
git fsck
git reset --hard origin/${PROD_BRANCH}
git checkout ${PREPROD_BRANCH}
git reset --hard origin/${PREPROD_BRANCH}
- git log --graph --all --oneline -n 10
+ git -c color.status=always log --all --decorate --oneline --graph -n 50
git merge origin/${PROD_BRANCH} --no-ff --strategy-option theirs --allow-unrelated-histories -m "Merged ${PROD_BRANCH} ${current_version} into ${PREPROD_BRANCH} ${SKIP_CI_COMMIT_PHRASE}"
git push ${REMOTE_NAME} ${PREPROD_BRANCH}
set +x
@@ -79,6 +79,8 @@ function do-deployment() {
poetry config repositories.${POETRY_REPOSITORY_PROPERTY_NAME} "${PYPI_REPO}"
+ which git && echo "\e[1;35mCurrent repository state:\e[0m" && git -c color.status=always log --all --decorate --oneline --graph -n 50
+
case "${COMMIT_REF}" in
${PROD_BRANCH})
# Ensure we have the staging ref as well as the master one
