This update fixes a merge conflict.

PiperOrigin-RevId: 623514390
Change-Id: I80fa75dc9fcd7bc3d51906653008979adbc0ec31

Author: Protocol Buffer Team

.github/workflows/gh-pages.yml

@@ -14,13 +14,17 @@ jobs:
       contents: write
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true  # Fetch Hugo themes (true OR recursive)
           fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
 
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v2
+        uses: peaceiris/actions-hugo@v3
         with:
           hugo-version: 0.121.2
           extended: true
@@ -32,7 +36,7 @@ jobs:
         run: hugo --minify
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         if: github.ref == 'refs/heads/main'
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

content/programming-guides/serialization-not-canonical.md

@@ -66,3 +66,4 @@ allow for more optimization opportunities:
 To leave room for optimizations like this, we want to intentionally scramble
 field order in some configurations, so that applications do not inappropriately
 depend on field order.
+