From e44e9d6d75ccc3af141eface724988953eb9e3a0 Mon Sep 17 00:00:00 2001 From: Brian Stansberry Date: Thu, 29 Feb 2024 12:23:12 -0600 Subject: [PATCH] [Issue_49] Fix comment syntax; add progress message --- .github/workflows/update_post_merge.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update_post_merge.yml b/.github/workflows/update_post_merge.yml index 6355a7eb..a5abc3d8 100644 --- a/.github/workflows/update_post_merge.yml +++ b/.github/workflows/update_post_merge.yml @@ -56,10 +56,11 @@ jobs: git checkout -b "${FIX_BRANCH_NAME}" if [ "${ORIGINAL_PR}" != '' ]; then - // Issue_549 Merge main into the PR branch to avoid permission issues if main - // includes .github/workflows changes that are not in the PR branch - MERGE_TARGET="$(git branch --show-current 2>/dev/null)" - git merge main -m "Merge 'main' into '${MERGE_TARGET}'" + # Issue_549 Merge main into FIX_BRANCH_NAME to avoid permission issues if main + # includes .github/workflows changes that are not in the PR branch + MERGE_MSG="Merge 'main' into '${FIX_BRANCH_NAME}'" + echo "${MERGE_MSG}" + git merge main -m "${MERGE_MSG}" fi readonly OLD_DATE=$(echo ${OLD_POST} | sed -E "s/([0-9]{4}\-[0-9]{2}\-[0-9]{2}).*/\1/")