Skip to content

Commit 6d988fc

Browse files
authored
fixes mitlify script to repull before pushing new updates (#529)
## Summary Add a `git pull` command before committing changes in the Mintlify changelog push script to prevent potential merge conflicts. ## Changes - Added a `git pull origin main` command before the commit step in the push-mintlify-changelog.sh script - This ensures the local repository is up-to-date with the remote main branch before committing changelog changes - Helps prevent merge conflicts when multiple changelog updates happen in parallel ## Type of change - [x] Bug fix - [ ] Feature - [ ] Refactor - [ ] Documentation - [x] Chore/CI ## Affected areas - [ ] Core (Go) - [ ] Transports (HTTP) - [ ] Providers/Integrations - [ ] Plugins - [ ] UI (Next.js) - [x] Docs ## How to test Run the changelog push script and verify it pulls the latest changes before committing: ```sh cd .github/workflows/scripts ./push-mintlify-changelog.sh <version> ``` ## Breaking changes - [ ] Yes - [x] No ## Related issues Prevents potential merge conflicts when multiple changelog updates are processed simultaneously. ## Security considerations No security implications. ## Checklist - [x] I read `docs/contributing/README.md` and followed the guidelines - [x] I added/updated tests where appropriate - [x] I updated documentation where needed - [x] I verified builds succeed (Go and UI) - [x] I verified the CI pipeline passes locally if applicable
2 parents c430386 + ad5ca29 commit 6d988fc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/scripts/push-mintlify-changelog.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ if ! grep -q "\"$route\"" docs/docs.json; then
8989
' docs/docs.json > docs/docs.json.tmp && mv docs/docs.json.tmp docs/docs.json
9090
fi
9191

92-
93-
92+
# Pulling again before committing
93+
git pull origin main
9494
# Commit and push changes
9595
git add docs/changelogs/$VERSION.mdx
9696
git add docs/docs.json

0 commit comments

Comments
 (0)