Merge main into staging

.github/workflows/merge-main-into-staging.yaml

@@ -19,6 +19,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: staging
+          fetch-depth: 0
 
       - name: Configure git
         run: |
@@ -27,8 +28,7 @@ jobs:
 
       - name: Merge in main branch
         run: |
-          git fetch origin main:main
-          git merge main --no-ff --allow-unrelated-histories --strategy-option theirs -m "Merging latest changes from main into staging"
+          git merge --no-ff origin/main
 
       - name: Create pull request
         id: pr-number

README.md

@@ -142,3 +142,5 @@ make get-source
 After you pull in the changes, commit them to this repo as part of the release notes process.
 
 <!-- September 16, 2024: Need to mention rendered Python `.html` docs and generated `.md` test descriptions -->
+
+<!-- Testing simplified merge strategy -->