Merge pull request #553 from bstansberry/Issue_549

[Issue_49] Fix comment syntax; add progress message

.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/")