Merge branch 'jscpd/merge' of github.com:Hweinstock/aws-toolkit-vscode into jscpd/merge

Author: Hweinstock

.github/workflows/node.js.yml

@@ -88,6 +88,8 @@ jobs:
             - name: Merge in target branch to avoid false negatives.
               env:
                   TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
+              # Note: "git merge" should always succeed here, because GHA won't
+              # start the job if there are merge conflicts. https://github.com/orgs/community/discussions/11265
               run: |
                   git config --global user.email "[email protected]"
                   git config --global user.name "ci"