fix: changelog commits logic

Author: rrrodzilla

.github/workflows/changelog.yml

@@ -20,12 +20,17 @@ jobs:
           repository: "Govcraft/rust-docs-mcp-server"
           ref: ${{ github.head_ref }}
       - name: Generate changelog
-        run: ./git-chglog -o CHANGELOG.md
+        run: |
+         git switch -c changelog-update 
+         ./git-chglog -o CHANGELOG.md
 
       - name: Check in CHANGELOG
         run: |
+          # merge the changelog-update branch into the main branch
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add './CHANGELOG.md'
           git commit -m "chore(docs): update CHANGELOG for latest tag"
+          git checkout main
+          git merge changelog-update --no-ff -m "chore(docs): update CHANGELOG for latest tag"
           git push