Merge pull request #48 from rak-phillip/bugfix/backport-merge-conflict

[Workflow] Trying to capture an error message

.github/workflows/port-pr.yaml

@@ -81,7 +81,7 @@ jobs:
           git config --global user.name "Rancher Dashboard Port Bot"
           git checkout -b $BRANCH
 
-          if ! git am -3 "$PATCH_FILE" 2>error.log; then
+          if ! git am -3 "$PATCH_FILE" > error.log 2>&1; then
               ERROR_MESSAGE=$(< error.log)
               FORMATTED_ERROR_MESSAGE=$(printf "\n\`\`\`\n%s\n\`\`\`" "$ERROR_MESSAGE")
               gh issue comment ${ORIGINAL_ISSUE_NUMBER} --body "Not creating port PR, there was an error running git am -3: $FORMATTED_ERROR_MESSAGE"